You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/06/09 16:35:48 UTC
[3/7] trafficserver git commit: TS-3543 Remove update.config and
related features, this also disables prefetch
TS-3543 Remove update.config and related features, this also disables prefetch
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/47782d62
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/47782d62
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/47782d62
Branch: refs/heads/master
Commit: 47782d62938f0ceab71c7ce8c6a0270cbfacda9a
Parents: 8d16cdb
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jun 8 12:49:06 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jun 9 08:15:06 2015 -0600
----------------------------------------------------------------------
cmd/traffic_manager/AddConfigFilesHere.cc | 1 -
cmd/traffic_manager/traffic_manager.cc | 3 -
doc/admin/http-proxy-caching.en.rst | 85 -
.../reference/configuration/update.config.en.po | 438 ---
doc/manpages.py | 1 -
doc/reference/configuration/index.en.rst | 1 -
.../configuration/records.config.en.rst | 34 -
.../configuration/update.config.en.rst | 213 --
lib/perl/lib/Apache/TS/AdminClient.pm | 8 -
mgmt/RecordsConfig.cc | 20 -
mgmt/api/APITestCliRemote.cc | 21 -
mgmt/api/CfgContextImpl.cc | 139 -
mgmt/api/CfgContextImpl.h | 26 -
mgmt/api/CfgContextUtils.cc | 34 -
mgmt/api/CfgContextUtils.h | 1 -
mgmt/api/GenericParser.cc | 4 -
mgmt/api/INKMgmtAPI.cc | 31 -
mgmt/api/include/mgmtapi.h | 20 +-
proxy/Main.cc | 6 -
proxy/Makefile.am | 5 +-
proxy/Prefetch.h | 1 -
proxy/TransformInternal.h | 1 -
proxy/Update.cc | 2576 ------------------
proxy/Update.h | 526 ----
proxy/config/Makefile.am | 1 -
proxy/config/update.config.default | 43 -
tools/traffic_shell.pl | 29 -
27 files changed, 4 insertions(+), 4264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/cmd/traffic_manager/AddConfigFilesHere.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/AddConfigFilesHere.cc b/cmd/traffic_manager/AddConfigFilesHere.cc
index bfed735..6482d26 100644
--- a/cmd/traffic_manager/AddConfigFilesHere.cc
+++ b/cmd/traffic_manager/AddConfigFilesHere.cc
@@ -78,7 +78,6 @@ initializeRegistry()
configFiles->addFile("ip_allow.config", false);
configFiles->addFile("parent.config", false);
configFiles->addFile("remap.config", false);
- configFiles->addFile("update.config", false);
configFiles->addFile("volume.config", false);
configFiles->addFile("hosting.config", false);
configFiles->addFile("congestion.config", false);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/cmd/traffic_manager/traffic_manager.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 9da4d99..974a00b 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -897,9 +897,6 @@ fileUpdated(char *fname, bool incVersion)
} else if (strcmp(fname, "icp.config") == 0) {
lmgmt->signalFileChange("proxy.config.icp.icp_configuration");
- } else if (strcmp(fname, "update.config") == 0) {
- lmgmt->signalFileChange("proxy.config.update.update_configuration");
-
} else if (strcmp(fname, "volume.config") == 0) {
mgmt_log(stderr, "[fileUpdated] volume.config changed, need restart\n");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/admin/http-proxy-caching.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/http-proxy-caching.en.rst b/doc/admin/http-proxy-caching.en.rst
index c29c824..317b186 100644
--- a/doc/admin/http-proxy-caching.en.rst
+++ b/doc/admin/http-proxy-caching.en.rst
@@ -280,91 +280,6 @@ To configure revalidation options
#. Run the :option:`traffic_line -x` command to apply the configuration changes.
-.. _scheduling-updates-to-local-cache-content:
-
-Scheduling Updates to Local Cache Content
-=========================================
-
-To further increase performance and to ensure that HTTP objects are
-fresh in the cache, you can use the *Scheduled Update* option. This
-configures Traffic Server to load specific objects into the cache at
-scheduled times, regardless of whether there is an active client request
-for those objects at the scheduled time. You might find this especially
-beneficial in a reverse proxy setup, where you can preload content you
-anticipate will be in demand.
-
-To use the scheduled update option, you must:
-
-- Specify the list of URLs that contain the objects you want to schedule
- for update.
-
-- Specify the time the update should take place.
-
-- Specify the recursion depth for the URL.
-
-- Enable the scheduled update option and configure optional retry
- settings.
-
-Traffic Server uses the information you provide to determine URLs for
-which it is responsible. For each URL, Traffic Server derives all
-recursive URLs (if applicable) and then generates a unique URL list.
-Using this list, Traffic Server initiates an HTTP ``GET`` for each
-unaccessed URL. It ensures that it remains within the user-defined
-limits for HTTP concurrency at any given time. The system logs the
-completion of all HTTP ``GET`` operations so you can monitor the
-performance of this feature.
-
-Traffic Server also provides a *Force Immediate Update* option that
-enables you to update URLs immediately without waiting for the specified
-update time to occur. You can use this option to test your scheduled
-update configuration. Refer to `Forcing an Immediate Update`_.
-
-Configuring the Scheduled Update Option
----------------------------------------
-
-To configure the scheduled update option
-
-#. Edit :file:`update.config` to enter a line in the file for each URL you
- want to update.
-
-#. Adjust the following variables in :file:`records.config`:
-
- - :ts:cv:`proxy.config.update.enabled`
- - :ts:cv:`proxy.config.update.retry_count`
- - :ts:cv:`proxy.config.update.retry_interval`
- - :ts:cv:`proxy.config.update.concurrent_updates`
-
-#. Run the :option:`traffic_line -x` command to apply the configuration changes.
-
-Forcing Immediate Updates
--------------------------
-
-Traffic Server provides a *Force Immediate Update* option that enables
-you to immediately verify the URLs listed in :file:`update.config`.
-This option disregards the offset hour and interval set in :file:`update.config`
-and immediately updates the URLs listed.
-
-To configure the Force Immediate Update option:
-
-#. Enable :ts:cv:`proxy.config.update.enabled` in :file:`records.config`::
-
- CONFIG proxy.config.update.enabled INT 1
-
-#. Enable :ts:cv:`proxy.config.update.force` in :file:`records.config`::
-
- CONFIG proxy.config.update.force INT 1
-
- While enabled, this overrides all normal scheduling intervals.
-
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
-
-.. important::
-
- When you enable the Force Immediate Update option, Traffic Server
- continually updates the URLs specified in :file:`update.config` until you
- disable the option. To disable the Force Immediate Update option, set
- :ts:cv:`proxy.config.update.force` to ``0`` (zero).
-
.. _pushing-content-into-the-cache:
Pushing Content into the Cache
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/locale/ja/LC_MESSAGES/reference/configuration/update.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/update.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/update.config.en.po
deleted file mode 100644
index 295270f..0000000
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/update.config.en.po
+++ /dev/null
@@ -1,438 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Apache Traffic Server 4.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-08 17:57+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EM...@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL...@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../reference/configuration/update.config.en.rst:20
-msgid "update.config"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:24
-msgid ""
-"The :file:`update.config` file controls how Traffic Server performs a "
-"scheduled update of specific local cache content. The file contains a list "
-"of URLs specifying objects that you want to schedule for update."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:28
-msgid ""
-"A scheduled update performs a local HTTP ``GET`` on the objects at the "
-"specific time or interval. You can control the following parameters for "
-"each specified object:"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:32
-msgid "The URL"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:33
-msgid "URL-specific request headers, which overrides the default"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:34
-msgid "The update time and interval"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:35
-msgid "The recursion depth"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:37
-msgid ""
-"After you modify the :file:`update.config` file, run the :option:"
-"`traffic_line -x` command to apply changes. When you apply changes to one "
-"node in a cluster, Traffic Server automatically applies the changes to all "
-"other nodes in the cluster."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:44
-msgid "Supported Tag/Attribute Pairs"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:46
-msgid ""
-"Scheduled update supports the following tag/attribute pairs when performing "
-"recursive URL updates:"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:49
-msgid "``<a href=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:50
-msgid "``<img src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:51
-msgid "``<img href=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:52
-msgid "``<body background=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:53
-msgid "``<frame src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:54
-msgid "``<iframe src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:55
-msgid "``<fig src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:56
-msgid "``<overlay src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:57
-msgid "``<applet code=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:58
-msgid "``<script src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:59
-msgid "``<embed src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:60
-msgid "``<bgsound src=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:61
-msgid "``<area href=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:62
-msgid "``<base href=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:63
-msgid "``<meta content=\" \">``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:65
-msgid ""
-"Scheduled update is designed to operate on URL sets consisting of hundreds "
-"of input URLs (expanded to thousands when recursive URLs are included); it "
-"is *not* intended to operate on extremely large URL sets, such as those "
-"used by Internet crawlers."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:71
-msgid "Format"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:73
-msgid ""
-"Each line in the :file:`update.config` file uses the following format::"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:77
-msgid "The following list describes each field."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:82
-msgid "*URL*"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:82
-msgid "HTTP-based URLs."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:89
-msgid "*request_headers*"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:87
-msgid ""
-"Optional. A list of headers, separated by semicolons, passed in each "
-"``GET`` request. You can define any request header that conforms to the "
-"HTTP specification; the default is no request header."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:95
-msgid "*offset_hour*"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:94
-msgid ""
-"The base hour used to derive the update periods. The range is 00-23 hours."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:101
-msgid "*interval*"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:100
-msgid ""
-"The interval (in seconds) at which updates should occur, starting at the "
-"offset hour."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:107
-msgid "*recursion_depth*"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:106
-msgid ""
-"The depth to which referenced URLs are recursively updated, starting at the "
-"given URL. This field applies only to HTTP."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:110
-msgid "Examples"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:112
-msgid "An example HTTP scheduled update is provided below:"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:118
-msgid ""
-"The example specifies the URL and request headers, an offset hour of 13 (1 "
-"pm), an interval of one hour, and a recursion depth of 5. This would result "
-"in updates at 13:00, 14:00, 15:00, and so on. To schedule an update that "
-"occurs only once a day, use an interval value 86400 (i.e., 24 hours x 60 "
-"minutes x 60 seconds = 86400)."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:127
-msgid "Specifying URL Regular Expressions (``url_regex``)"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:129
-msgid ""
-"This section describes how to specify a ``url_regex``. Entries of type "
-"``url_regex`` within the configuration files use regular expressions to "
-"perform a match."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:133
-msgid ""
-"The following list provides examples to show how to create a valid "
-"``url_regex``."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:137
-msgid "``x``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:137
-msgid "Matches the character ``x``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:140
-msgid "``.``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:140
-msgid "Match any character"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:143
-msgid "``^``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:143
-msgid "Specifies beginning of line"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:146
-msgid "``$``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:146
-msgid "Specifies end of line"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:150
-msgid "``[xyz]``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:149
-msgid ""
-"A **character class**. In this case, the pattern matches either ``x``, "
-"``y``, or\\ ``z``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:154
-msgid "``[abj-oZ]``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:153
-msgid ""
-"A **character class** with a range. This pattern matches ``a``, ``b``, any "
-"letter from ``j`` through ``o``, or ``Z``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:158
-msgid "``[^A-Z]``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:157
-msgid ""
-"A **negated character class**. For example, this pattern matches any "
-"character except those in the class."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:161
-msgid "``r*``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:161
-msgid "Zero or more ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:164
-msgid "``r+``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:164
-msgid "One or more ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:167
-msgid "``r?``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:167
-msgid "Zero or one ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:170
-msgid "``r{2,5}``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:170
-msgid "From two to five ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:173
-msgid "``r{2,}``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:173
-msgid "Two or more ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:176
-msgid "``r{4}``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:176
-msgid "Exactly four ``r``, where ``r`` is any regular expression."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:179
-msgid "``\"[xyz]\\\"images\"``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:179
-msgid "The literal string ``[xyz]\"images\"``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:184
-msgid "``\\X``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:182
-msgid ""
-"If ``X`` is ``a, b, f, n, r, t,`` or ``v``, then the ``ANSI-C`` "
-"interpretation of ``\\x``; otherwise, a literal ``X``. This is used to "
-"escape operators such as ``*``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:187
-msgid "``\\0``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:187
-msgid "A ``NULL`` character"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:190
-msgid "``\\123``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:190
-msgid "The character with octal value ``123``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:193
-msgid "``\\x2a``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:193
-msgid "The character with hexadecimal value ``2a``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:197
-msgid "``(r)``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:196
-msgid ""
-"Matches an ``r``, where ``r`` is any regular expression. You can use "
-"parentheses to override precedence."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:201
-msgid "``rs``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:200
-msgid "The regular expression ``r``, followed by the regular expression ``s``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:204
-msgid "``r|s``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:204
-msgid "Either an ``r`` or an ``s``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:208
-msgid "``#<n>#``"
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:207
-msgid ""
-"Inserts an **end node**, which causes regular expression matching to stop "
-"when reached. The value ``n`` is returned."
-msgstr ""
-
-#: ../../reference/configuration/update.config.en.rst:210
-msgid ""
-"You can specify ``dest_domain=mydomain.com`` to match any host in "
-"``mydomain.com``. Likewise, you can specify ``dest_domain=.`` to match any "
-"request."
-msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/manpages.py
----------------------------------------------------------------------
diff --git a/doc/manpages.py b/doc/manpages.py
index 0361671..9b6d491 100644
--- a/doc/manpages.py
+++ b/doc/manpages.py
@@ -48,7 +48,6 @@ man_pages = [
('reference/configuration/splitdns.config.en', 'splitdns.config', u'Traffic Server split DNS configuration file', None, '5'),
('reference/configuration/ssl_multicert.config.en', 'ssl_multicert.config', u'Traffic Server SSL certificate configuration file', None, '5'),
('reference/configuration/storage.config.en', 'storage.config', u'Traffic Server cache storage configuration file', None, '5'),
- ('reference/configuration/update.config.en', 'update.config', u'Traffic Server automated update configuration file', None, '5'),
('reference/configuration/volume.config.en', 'volume.config', u'Traffic Server cache volume configuration file', None, '5'),
]
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/reference/configuration/index.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/index.en.rst b/doc/reference/configuration/index.en.rst
index 0b58eea..531511e 100644
--- a/doc/reference/configuration/index.en.rst
+++ b/doc/reference/configuration/index.en.rst
@@ -39,5 +39,4 @@ Configuration File Reference
splitdns.config.en
ssl_multicert.config.en
storage.config.en
- update.config.en
volume.config.en
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index d58367d..451e0e2 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2659,40 +2659,6 @@ SPDY Configuration
.. note:: Reloading this value affects only new SPDY connections, not the
ones already established..
-Scheduled Update Configuration
-==============================
-
-.. ts:cv:: CONFIG proxy.config.update.enabled INT 0
-
- Enables (``1``) or disables (``0``) the Scheduled Update option.
-
-.. ts:cv:: CONFIG proxy.config.update.force INT 0
- :reloadable:
-
- Enables (``1``) or disables (``0``) a force immediate update. When
- enabled, Traffic Server overrides the scheduling expiration time for
- all scheduled update entries and initiates updates until this option
- is disabled.
-
-.. ts:cv:: CONFIG proxy.config.update.retry_count INT 10
- :reloadable:
-
- Specifies the number of times Traffic Server can retry the scheduled
- update of a URL in the event of failure.
-
-.. ts:cv:: CONFIG proxy.config.update.retry_interval INT 2
- :reloadable:
-
- Specifies the delay (in seconds) between each scheduled update retry
- for a URL in the event of failure.
-
-.. ts:cv:: CONFIG proxy.config.update.concurrent_updates INT 100
- :reloadable:
-
- Specifies the maximum simultaneous update requests allowed at any
- time. This option prevents the scheduled update process from
- overburdening the host.
-
Plug-in Configuration
=====================
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/doc/reference/configuration/update.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/update.config.en.rst b/doc/reference/configuration/update.config.en.rst
deleted file mode 100644
index 33a7931..0000000
--- a/doc/reference/configuration/update.config.en.rst
+++ /dev/null
@@ -1,213 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-=============
-update.config
-=============
-
-.. configfile:: update.config
-
-The :file:`update.config` file controls how Traffic Server performs a
-scheduled update of specific local cache content. The file contains a
-list of URLs specifying objects that you want to schedule for update.
-
-A scheduled update performs a local HTTP ``GET`` on the objects at the
-specific time or interval. You can control the following parameters for
-each specified object:
-
-- The URL
-- URL-specific request headers, which overrides the default
-- The update time and interval
-- The recursion depth
-
-After you modify the :file:`update.config` file,
-run the :option:`traffic_line -x`
-command to apply changes. When you apply changes to one node in a
-cluster, Traffic Server automatically applies the changes to all other
-nodes in the cluster.
-
-Supported Tag/Attribute Pairs
-=============================
-
-Scheduled update supports the following tag/attribute pairs when
-performing recursive URL updates:
-
-- ``<a href=" ">``
-- ``<img src=" ">``
-- ``<img href=" ">``
-- ``<body background=" ">``
-- ``<frame src=" ">``
-- ``<iframe src=" ">``
-- ``<fig src=" ">``
-- ``<overlay src=" ">``
-- ``<applet code=" ">``
-- ``<script src=" ">``
-- ``<embed src=" ">``
-- ``<bgsound src=" ">``
-- ``<area href=" ">``
-- ``<base href=" ">``
-- ``<meta content=" ">``
-
-Scheduled update is designed to operate on URL sets consisting of
-hundreds of input URLs (expanded to thousands when recursive URLs are
-included); it is *not* intended to operate on extremely large URL sets,
-such as those used by Internet crawlers.
-
-Format
-======
-
-Each line in the :file:`update.config` file uses the following format::
-
- URL\request_headers\offset_hour\interval\recursion_depth\
-
-The following list describes each field.
-
-.. _update-config-format-url:
-
-*URL*
- HTTP-based URLs.
-
-.. _update-config-format-request-headers:
-
-*request_headers*
- Optional. A list of headers, separated by semicolons, passed in each
- ``GET`` request. You can define any request header that conforms to
- the HTTP specification; the default is no request header.
-
-.. _update-config-format-offset-hour:
-
-*offset_hour*
- The base hour used to derive the update periods. The range is 00-23
- hours.
-
-.. _update-config-format-interval:
-
-*interval*
- The interval (in seconds) at which updates should occur, starting at
- the offset hour.
-
-.. _update-config-format-reecursion-depth:
-
-*recursion_depth*
- The depth to which referenced URLs are recursively updated, starting
- at the given URL. This field applies only to HTTP.
-
-Examples
-========
-
-An example HTTP scheduled update is provided below:
-
-::
-
- http://www.company.com\User-Agent: noname user agent\13\3600\5\
-
-The example specifies the URL and request headers, an offset hour of 13
-(1 pm), an interval of one hour, and a recursion depth of 5. This would
-result in updates at 13:00, 14:00, 15:00, and so on. To schedule an
-update that occurs only once a day, use an interval value 86400 (i.e.,
-24 hours x 60 minutes x 60 seconds = 86400).
-
-.. XXX: The following seems misplaced here, and is probably better off placed in an apendix.
-
-Specifying URL Regular Expressions (``url_regex``)
-==================================================
-
-This section describes how to specify a ``url_regex``. Entries of type
-``url_regex`` within the configuration files use regular expressions to
-perform a match.
-
-The following list provides examples to show how to create a valid
-``url_regex``.
-
-``x``
- Matches the character ``x``
-
-``.``
- Match any character
-
-``^``
- Specifies beginning of line
-
-``$``
- Specifies end of line
-
-``[xyz]``
- A **character class**. In this case, the pattern matches either
- ``x``, ``y``, or\ ``z``
-
-``[abj-oZ]``
- A **character class** with a range. This pattern matches ``a``,
- ``b``, any letter from ``j`` through ``o``, or ``Z``
-
-``[^A-Z]``
- A **negated character class**. For example, this pattern matches any
- character except those in the class.
-
-``r*``
- Zero or more ``r``, where ``r`` is any regular expression.
-
-``r+``
- One or more ``r``, where ``r`` is any regular expression.
-
-``r?``
- Zero or one ``r``, where ``r`` is any regular expression.
-
-``r{2,5}``
- From two to five ``r``, where ``r`` is any regular expression.
-
-``r{2,}``
- Two or more ``r``, where ``r`` is any regular expression.
-
-``r{4}``
- Exactly four ``r``, where ``r`` is any regular expression.
-
-``"[xyz]\"images"``
- The literal string ``[xyz]"images"``
-
-``\X``
- If ``X`` is ``a, b, f, n, r, t,`` or ``v``, then the ``ANSI-C``
- interpretation of ``\x``; otherwise, a literal ``X``. This is used
- to escape operators such as ``*``
-
-``\0``
- A ``NULL`` character
-
-``\123``
- The character with octal value ``123``
-
-``\x2a``
- The character with hexadecimal value ``2a``
-
-``(r)``
- Matches an ``r``, where ``r`` is any regular expression. You can use
- parentheses to override precedence.
-
-``rs``
- The regular expression ``r``, followed by the regular expression
- ``s``
-
-``r|s``
- Either an ``r`` or an ``s``
-
-``#<n>#``
- Inserts an **end node**, which causes regular expression matching to
- stop when reached. The value ``n`` is returned.
-
-You can specify ``dest_domain=mydomain.com`` to match any host in
-``mydomain.com``. Likewise, you can specify ``dest_domain=.`` to match
-any request.
-
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/lib/perl/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/lib/perl/lib/Apache/TS/AdminClient.pm b/lib/perl/lib/Apache/TS/AdminClient.pm
index 577c337..226268f 100644
--- a/lib/perl/lib/Apache/TS/AdminClient.pm
+++ b/lib/perl/lib/Apache/TS/AdminClient.pm
@@ -723,14 +723,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.udp.free_cancelled_pkts_sec
proxy.config.udp.periodic_cleanup
proxy.config.udp.send_retries
- proxy.config.update.concurrent_updates
- proxy.config.update.enabled
- proxy.config.update.force
- proxy.config.update.max_update_state_machines
- proxy.config.update.memory_use_mb
- proxy.config.update.retry_count
- proxy.config.update.retry_interval
- proxy.config.update.update_configuration
proxy.config.url_remap.default_to_server_pac
proxy.config.url_remap.default_to_server_pac_port
proxy.config.url_remap.filename
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index eae4690..51dfa0f 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1400,26 +1400,6 @@ static const RecordElement RecordsConfig[] =
,
//##############################################################################
- //# Scheduled Update Configuration
- //##############################################################################
- {RECT_CONFIG, "proxy.config.update.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.update_configuration", RECD_STRING, "update.config", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.force", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.retry_count", RECD_INT, "10", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.retry_interval", RECD_INT, "2", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.concurrent_updates", RECD_INT, "100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.max_update_state_machines", RECD_INT, "500", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.update.memory_use_mb", RECD_INT, "50", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
-
- //##############################################################################
//# Plug-in Configuration
//##############################################################################
//# Directory in which to find plugins
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/APITestCliRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index 3c60a5c..3ec6ec3 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -759,20 +759,6 @@ print_storage_ele(TSStorageEle *ele)
}
void
-print_update_ele(TSUpdateEle *ele)
-{
- if (!ele) {
- printf("can't print ele\n");
- return;
- }
-
- printf("url: %s\n", ele->url);
- printf("headers: ");
- print_string_list(ele->headers);
- printf("%d: %d: %d\n", ele->offset_hour, ele->interval, ele->recursion_depth);
-}
-
-void
print_vaddrs_ele(TSVirtIpAddrEle *ele)
{
if (!ele) {
@@ -841,9 +827,6 @@ print_ele_list(TSFileNameT file, TSCfgContext ctx)
case TS_FNAME_STORAGE:
print_storage_ele((TSStorageEle *)ele);
break;
- case TS_FNAME_UPDATE_URL:
- print_update_ele((TSUpdateEle *)ele);
- break;
case TS_FNAME_VADDRS:
print_vaddrs_ele((TSVirtIpAddrEle *)ele);
default:
@@ -1548,8 +1531,6 @@ test_cfg_context_get(char *args)
file = TS_FNAME_STORAGE;
} else if (strcmp(name, "splitdns.config") == 0) {
file = TS_FNAME_SPLIT_DNS;
- } else if (strcmp(name, "update.config") == 0) {
- file = TS_FNAME_UPDATE_URL;
} else if (strcmp(name, "vaddrs.config") == 0) {
file = TS_FNAME_VADDRS;
} else {
@@ -1617,8 +1598,6 @@ test_cfg_context_move(char *args)
file = TS_FNAME_STORAGE;
} else if (strcmp(name, "splitdns.config") == 0) {
file = TS_FNAME_SPLIT_DNS;
- } else if (strcmp(name, "update.config") == 0) {
- file = TS_FNAME_UPDATE_URL;
} else if (strcmp(name, "vaddrs.config") == 0) {
file = TS_FNAME_VADDRS;
} else {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/CfgContextImpl.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc
index 2361707..9a5f0e3 100644
--- a/mgmt/api/CfgContextImpl.cc
+++ b/mgmt/api/CfgContextImpl.cc
@@ -2279,145 +2279,6 @@ StorageObj::getCfgEleCopy()
return (TSCfgEle *)copy_storage_ele(m_ele);
}
-//--------------------------------------------------------------------------
-// UpdateObj
-//--------------------------------------------------------------------------
-UpdateObj::UpdateObj(TSUpdateEle *ele)
-{
- m_ele = ele;
- m_valid = true;
- m_valid = isValid();
-}
-
-UpdateObj::UpdateObj(TokenList *tokens)
-{
- Token *token;
-
- m_ele = TSUpdateEleCreate();
- m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
-
- if (!tokens || tokens->length < 5) {
- goto FORMAT_ERR;
- }
-
- m_ele->cfg_ele.type = get_rule_type(tokens, TS_FNAME_UPDATE_URL);
- if (m_ele->cfg_ele.type == TS_TYPE_UNDEFINED) {
- goto FORMAT_ERR;
- }
- // URL
- token = tokens->first();
- if (strcmp(token->name, "") == 0) {
- goto FORMAT_ERR;
- }
- m_ele->url = ats_strdup(token->name);
-
- // Request_headers
- token = tokens->next(token);
- m_ele->headers = string_to_string_list(token->name, ";");
-
- // Offset_hour
- token = tokens->next(token);
- if (strcmp(token->name, "") == 0) {
- goto FORMAT_ERR;
- }
- m_ele->offset_hour = ink_atoi(token->name);
-
- // Interval
- token = tokens->next(token);
- if (strcmp(token->name, "") == 0) {
- goto FORMAT_ERR;
- }
- m_ele->interval = ink_atoi(token->name);
-
- // Recursion_depth
- token = tokens->next(token);
- if (strcmp(token->name, "") == 0) {
- goto FORMAT_ERR;
- }
- m_ele->recursion_depth = ink_atoi(token->name);
- return;
-
-FORMAT_ERR:
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
-}
-
-UpdateObj::~UpdateObj()
-{
- TSUpdateEleDestroy(m_ele);
-}
-
-char *
-UpdateObj::formatEleToRule()
-{
- if (!isValid()) {
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- return NULL;
- }
-
- char *list_str;
- char buf[MAX_RULE_SIZE];
- memset(buf, 0, MAX_RULE_SIZE);
-
- list_str = string_list_to_string(m_ele->headers, ";");
- if (list_str) {
- snprintf(buf, sizeof(buf), "%s\\%s\\%d\\%d\\%d\\", m_ele->url, list_str, m_ele->offset_hour, m_ele->interval,
- m_ele->recursion_depth);
- ats_free(list_str);
- } else {
- snprintf(buf, sizeof(buf), "%s\\\\%d\\%d\\%d\\", m_ele->url, m_ele->offset_hour, m_ele->interval, m_ele->recursion_depth);
- }
-
- return ats_strdup(buf);
-}
-
-bool
-UpdateObj::isValid()
-{
- if (m_ele->cfg_ele.error != TS_ERR_OKAY) {
- m_valid = false;
- }
- // check url
- if (!m_ele->url || strcmp(m_ele->url, "") == 0 || strstr(m_ele->url, "\\") || (!strstr(m_ele->url, "http"))) {
- m_valid = false;
- }
- // bug 49322: check that there are no "\" in the url or headers
- char *list_str = string_list_to_string(m_ele->headers, ";");
- if (list_str) {
- if (strstr(list_str, "\\"))
- m_valid = false;
- ats_free(list_str);
- }
- // offset hour range is 00-23
- if (m_ele->offset_hour < 0 || m_ele->offset_hour > 23)
- m_valid = false;
-
- if (m_ele->interval < 0)
- m_valid = false;
-
- // optional - default is 0
- if (m_ele->recursion_depth < 0) {
- m_valid = false;
- }
- // recursion depth can only be specified for http
- if (m_ele->recursion_depth > 0) {
- if (!m_ele->url || !strstr(m_ele->url, "http")) {
- m_valid = false;
- }
- }
-
- if (!m_valid)
- m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
-
- return m_valid;
-}
-
-TSCfgEle *
-UpdateObj::getCfgEleCopy()
-{
- return (TSCfgEle *)copy_update_ele(m_ele);
-}
//--------------------------------------------------------------------------
// VirtIpAddrObj
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/CfgContextImpl.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextImpl.h b/mgmt/api/CfgContextImpl.h
index 451c0ce..1c50084 100644
--- a/mgmt/api/CfgContextImpl.h
+++ b/mgmt/api/CfgContextImpl.h
@@ -493,32 +493,6 @@ private:
};
-/* update.config *******************************************/
-class UpdateObj : public CfgEleObj
-{
-public:
- UpdateObj(TSUpdateEle *ele);
- UpdateObj(TokenList *tokens);
- ~UpdateObj();
-
- virtual char *formatEleToRule();
- virtual bool isValid();
- virtual TSCfgEle *getCfgEleCopy();
- virtual TSCfgEle *
- getCfgEle()
- {
- return (TSCfgEle *)m_ele;
- }
- virtual TSRuleTypeT
- getRuleType()
- {
- return m_ele->cfg_ele.type;
- }
-
-private:
- TSUpdateEle *m_ele;
-};
-
/* vaddrs.config *******************************************/
class VirtIpAddrObj : public CfgEleObj
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/CfgContextUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index d6d4296..873a6eb 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -1424,8 +1424,6 @@ filename_to_string(TSFileNameT file)
return "splitdns.config";
case TS_FNAME_STORAGE:
return "storage.config";
- case TS_FNAME_UPDATE_URL:
- return "update.config";
case TS_FNAME_VADDRS:
return "vaddrs.config";
default: /* no such config file */
@@ -1936,9 +1934,6 @@ create_ele_obj_from_rule_node(Rule *rule)
case TS_STORAGE:
ele = (CfgEleObj *)new StorageObj(token_list);
break;
- case TS_UPDATE_URL: /* update.config */
- ele = (CfgEleObj *)new UpdateObj(token_list);
- break;
case TS_VADDRS: /* vaddrs.config */
ele = (CfgEleObj *)new VirtIpAddrObj(token_list);
break;
@@ -2036,10 +2031,6 @@ create_ele_obj_from_ele(TSCfgEle *ele)
ele_obj = (CfgEleObj *)new StorageObj((TSStorageEle *)ele);
break;
- case TS_UPDATE_URL: /* update.config */
- ele_obj = (CfgEleObj *)new UpdateObj((TSUpdateEle *)ele);
- break;
-
case TS_VADDRS: /* vaddrs.config */
ele_obj = (CfgEleObj *)new VirtIpAddrObj((TSVirtIpAddrEle *)ele);
break;
@@ -2166,9 +2157,6 @@ get_rule_type(TokenList *token_list, TSFileNameT file)
case TS_FNAME_STORAGE: /* storage.config */
return TS_STORAGE;
- case TS_FNAME_UPDATE_URL: /* update.config */
- return TS_UPDATE_URL;
-
case TS_FNAME_VADDRS: /* vaddrs.config */
return TS_VADDRS;
case TS_FNAME_UNDEFINED:
@@ -2753,28 +2741,6 @@ copy_storage_ele(TSStorageEle *ele)
return nele;
}
-TSUpdateEle *
-copy_update_ele(TSUpdateEle *ele)
-{
- if (!ele) {
- return NULL;
- }
-
- TSUpdateEle *nele = TSUpdateEleCreate();
- if (!nele)
- return NULL;
-
- copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
- if (ele->url)
- nele->url = ats_strdup(ele->url);
- nele->headers = copy_string_list(ele->headers);
- nele->offset_hour = ele->offset_hour;
- nele->interval = ele->interval;
- nele->recursion_depth = ele->recursion_depth;
-
- return nele;
-}
-
TSVirtIpAddrEle *
copy_virt_ip_addr_ele(TSVirtIpAddrEle *ele)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/CfgContextUtils.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.h b/mgmt/api/CfgContextUtils.h
index 91d0794..3fb4de0 100644
--- a/mgmt/api/CfgContextUtils.h
+++ b/mgmt/api/CfgContextUtils.h
@@ -189,7 +189,6 @@ TSRemapEle *copy_remap_ele(TSRemapEle *ele);
TSSocksEle *copy_socks_ele(TSSocksEle *ele);
TSSplitDnsEle *copy_split_dns_ele(TSSplitDnsEle *ele);
TSStorageEle *copy_storage_ele(TSStorageEle *ele);
-TSUpdateEle *copy_update_ele(TSUpdateEle *ele);
TSVirtIpAddrEle *copy_virt_ip_addr_ele(TSVirtIpAddrEle *ele);
INKCommentEle *copy_comment_ele(INKCommentEle *ele);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/GenericParser.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index 120c75f..eb97e4f 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -216,8 +216,6 @@ Rule::parse(const char *const_rule, TSFileNameT filetype)
return splitdnsParse(rule);
case TS_FNAME_STORAGE: /* storage.config */
return storageParse(rule);
- case TS_FNAME_UPDATE_URL: /* update.config */
- return updateParse(rule);
case TS_FNAME_VADDRS: /* vaddrs.config */
return vaddrsParse(rule);
default:
@@ -943,8 +941,6 @@ RuleList::parse(char *fileBuf, const char *filename)
m_filetype = TS_FNAME_SOCKS; /* socks.config */
} else if (strstr(filename, "splitdns.config")) {
m_filetype = TS_FNAME_SPLIT_DNS; /* splitdns.config */
- } else if (strstr(filename, "update.config")) {
- m_filetype = TS_FNAME_UPDATE_URL; /* update.config */
} else if (strstr(filename, "vaddrs.config")) {
m_filetype = TS_FNAME_VADDRS; /* vaddrs.config */
} else if (strstr(filename, "plugin.config")) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/INKMgmtAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index ba20158..d10bcf8 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -1352,37 +1352,6 @@ TSStorageEleDestroy(TSStorageEle *ele)
}
/*-------------------------------------------------------------
- * TSUpdateEle
- *-------------------------------------------------------------*/
-TSUpdateEle *
-TSUpdateEleCreate()
-{
- TSUpdateEle *ele = (TSUpdateEle *)ats_malloc(sizeof(TSUpdateEle));
-
- ele->cfg_ele.type = TS_UPDATE_URL;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->url = NULL;
- ele->headers = TS_INVALID_LIST;
- ele->offset_hour = -1;
- ele->interval = -1;
- ele->recursion_depth = 0;
-
- return ele;
-}
-
-void
-TSUpdateEleDestroy(TSUpdateEle *ele)
-{
- if (ele) {
- ats_free(ele->url);
- if (ele->headers)
- TSStringListDestroy(ele->headers);
- ats_free(ele);
- }
- return;
-}
-
-/*-------------------------------------------------------------
* TSVirtIpAddrEle
*-------------------------------------------------------------*/
TSVirtIpAddrEle *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/mgmt/api/include/mgmtapi.h
----------------------------------------------------------------------
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index b1be9ef..fb318ac 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -313,7 +313,6 @@ typedef enum {
TS_FNAME_SOCKS, /* socks.config */
TS_FNAME_SPLIT_DNS, /* splitdns.config */
TS_FNAME_STORAGE, /* storage.config */
- TS_FNAME_UPDATE_URL, /* update.config */
TS_FNAME_VADDRS, /* vaddrs.config */
TS_FNAME_VSCAN, /* vscan.config */
TS_FNAME_VS_TRUSTED_HOST, /* trusted-host.config */
@@ -354,10 +353,9 @@ typedef enum {
TS_SOCKS_BYPASS, /* socks.config */
TS_SOCKS_AUTH,
TS_SOCKS_MULTIPLE,
- TS_SPLIT_DNS, /* splitdns.config */
- TS_STORAGE, /* storage.config */
- TS_UPDATE_URL, /* update.config */
- TS_VADDRS, /* vaddrs.config */
+ TS_SPLIT_DNS, /* splitdns.config */
+ TS_STORAGE, /* storage.config */
+ TS_VADDRS, /* vaddrs.config */
TS_TYPE_UNDEFINED,
TS_TYPE_COMMENT /* for internal use only */
} TSRuleTypeT;
@@ -678,16 +676,6 @@ typedef struct {
int size; /* size of the named pathname (in bytes); optional if raw disk partitions */
} TSStorageEle;
-/* update.config */
-typedef struct {
- TSCfgEle cfg_ele;
- char *url; /* url to update (HTTP based URLs) */
- TSStringList headers; /* list of headers, separated by semicolons (can be NULL) */
- int offset_hour; /* offset hour to start update; must be 00-23 hrs */
- int interval; /* in secs, frequency of updates starting at offset_hour */
- int recursion_depth; /* starting at given URL, the depth to which referenced URLs are recursively updated */
-} TSUpdateEle;
-
/* vaddrs.config */
typedef struct {
TSCfgEle cfg_ele;
@@ -848,8 +836,6 @@ tsapi TSSplitDnsEle *TSSplitDnsEleCreate();
tsapi void TSSplitDnsEleDestroy(TSSplitDnsEle *ele);
tsapi TSStorageEle *TSStorageEleCreate();
tsapi void TSStorageEleDestroy(TSStorageEle *ele);
-tsapi TSUpdateEle *TSUpdateEleCreate();
-tsapi void TSUpdateEleDestroy(TSUpdateEle *ele);
tsapi TSVirtIpAddrEle *TSVirtIpAddrEleCreate();
tsapi void TSVirtIpAddrEleDestroy(TSVirtIpAddrEle *ele);
/*--- Ele helper operations -------------------------------------*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 4684945..cbbcf0a 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -84,7 +84,6 @@ extern "C" int plock(int);
#include "Plugin.h"
#include "DiagsConfig.h"
#include "CoreUtils.h"
-#include "Update.h"
#include "congest/Congestion.h"
#include "RemapProcessor.h"
#include "I_Tasks.h"
@@ -1789,11 +1788,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
start_SocksProxy(netProcessor.socks_conf_stuff->accept_port);
}
- ///////////////////////////////////////////
- // Initialize Scheduled Update subsystem
- ///////////////////////////////////////////
- updateManager.start();
-
pmgmt->registerMgmtCallback(MGMT_EVENT_SHUTDOWN, mgmt_restart_shutdown_callback, NULL);
pmgmt->registerMgmtCallback(MGMT_EVENT_RESTART, mgmt_restart_shutdown_callback, NULL);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index ce5041f..4fdc49f 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -185,9 +185,7 @@ traffic_server_SOURCES = \
StatSystem.h \
Transform.cc \
Transform.h \
- TransformInternal.h \
- Update.cc \
- Update.h
+ TransformInternal.h
if BUILD_TESTS
traffic_server_SOURCES += \
@@ -299,7 +297,6 @@ traffic_sac_SOURCES = \
ProtocolProbeSessionAccept.h \
ProxyClientSession.cc \
ProxyClientSession.h \
- Update.cc \
Plugin.cc \
InkAPI.cc \
FetchSM.cc \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/proxy/Prefetch.h
----------------------------------------------------------------------
diff --git a/proxy/Prefetch.h b/proxy/Prefetch.h
index 42401e1..9631075 100644
--- a/proxy/Prefetch.h
+++ b/proxy/Prefetch.h
@@ -29,7 +29,6 @@
#ifdef PREFETCH
-#include "Update.h"
#include "api/ts/experimental.h"
class BlasterUrlList;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/47782d62/proxy/TransformInternal.h
----------------------------------------------------------------------
diff --git a/proxy/TransformInternal.h b/proxy/TransformInternal.h
index a9d1c34..ccf83d6 100644
--- a/proxy/TransformInternal.h
+++ b/proxy/TransformInternal.h
@@ -152,7 +152,6 @@ public:
int64_t m_done;
};
-#define PREFETCH
#ifdef PREFETCH
class PrefetchProcessor
{