s/traffic_line/traffic_ctl/
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c498d7e6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c498d7e6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c498d7e6 Branch: refs/heads/master Commit: c498d7e66d75f0504aa0b0e8dcc5080a7fbaab1f Parents: 09acc0b Author: James Peach <[email protected]> Authored: Mon Oct 26 16:05:59 2015 -0700 Committer: James Peach <[email protected]> Committed: Tue Oct 27 19:15:17 2015 -0700 ---------------------------------------------------------------------- lib/records/I_RecDefs.h | 2 +- plugins/experimental/healthchecks/healthchecks.c | 2 +- plugins/experimental/url_sig/README | 8 ++++---- plugins/experimental/url_sig/url_sig.c | 2 +- plugins/gzip/README | 4 ++-- plugins/regex_remap/README | 2 +- rc/trafficserver.service.in | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/lib/records/I_RecDefs.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h index c0317dd..8f9084d 100644 --- a/lib/records/I_RecDefs.h +++ b/lib/records/I_RecDefs.h @@ -108,7 +108,7 @@ namespace detail enum RecUpdateT { RECU_NULL, // default: don't know the behavior - RECU_DYNAMIC, // config can be updated dynamically w/ traffic_line -x + RECU_DYNAMIC, // config can be updated dynamically w/ "traffic_ctl config reload" RECU_RESTART_TS, // config requires TS to be restarted to take effect RECU_RESTART_TM, // config requires TM/TS to be restarted to take effect RECU_RESTART_TC // config requires TC/TM/TS to be restarted to take effect http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/plugins/experimental/healthchecks/healthchecks.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/healthchecks/healthchecks.c b/plugins/experimental/healthchecks/healthchecks.c index e83518c..b6f262f 100644 --- a/plugins/experimental/healthchecks/healthchecks.c +++ b/plugins/experimental/healthchecks/healthchecks.c @@ -553,7 +553,7 @@ TSPluginInit(int argc, const char *argv[]) } /* This will update the global configuration file, and is not reloaded at run time */ - /* ToDo: Support reloading with traffic_line -x ? */ + /* ToDo: Support reloading with traffic_ctl config reload ? */ if (NULL == (g_config = parse_configs(argv[1]))) { TSError("[healthchecks] Unable to read / parse %s config file", argv[1]); return; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/plugins/experimental/url_sig/README ---------------------------------------------------------------------- diff --git a/plugins/experimental/url_sig/README b/plugins/experimental/url_sig/README index d2a4ce0..aa9a650 100644 --- a/plugins/experimental/url_sig/README +++ b/plugins/experimental/url_sig/README @@ -37,9 +37,9 @@ Edge cache debugging CONFIG proxy.config.diags.debug.enabled INT 1 CONFIG proxy.config.diags.debug.tags STRING url_sig - and do a traffic_line -x; Debug output will go to traffic.out. - Failed transactions (signature check fails that is) will be logged - in to error.log. + and do a traffic_ctl config reload; Debug output will go + to traffic.out. Failed transactions (signature check fails + that is) will be logged in to error.log. Signing a URL At the signing portal take the full URL, without any query string, and @@ -110,7 +110,7 @@ Example map http://test-remap.domain.com http://google.com @plugin=url_sig.so @pparam=sign_test.config - Restart traffic server or traffic_line -x - verify there are no errors in diags.log + Restart traffic server or "traffic_ctl config reload" - verify there are no errors in diags.log Try the path unsigned: http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/plugins/experimental/url_sig/url_sig.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/url_sig/url_sig.c b/plugins/experimental/url_sig/url_sig.c index fe90ee7..96a5521 100644 --- a/plugins/experimental/url_sig/url_sig.c +++ b/plugins/experimental/url_sig/url_sig.c @@ -88,7 +88,7 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size) return TS_SUCCESS; } -// To force a config file reload touch remap.config and do a "traffic_line -x" +// To force a config file reload touch remap.config and do a "traffic_ctl config reload" TSReturnCode TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_size) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/plugins/gzip/README ---------------------------------------------------------------------- diff --git a/plugins/gzip/README b/plugins/gzip/README index 34b4ef6..4872369 100644 --- a/plugins/gzip/README +++ b/plugins/gzip/README @@ -24,8 +24,8 @@ in this case, the plugin will use a default behaviour: alternatively, a configuration can also be specified: gzip.so <path-to-plugin>/sample.gzip.config -after modifying plugin.config, restart traffic server (sudo traffic_line -L) -the configuration is re-read when a management update is given (sudo traffic_line -x) +after modifying plugin.config, restart traffic server (sudo traffic_ctl server restart) +the configuration is re-read when a management update is given (sudo traffic_ctl config reload) a sample configuration (sample.gzip.config): http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/plugins/regex_remap/README ---------------------------------------------------------------------- diff --git a/plugins/regex_remap/README b/plugins/regex_remap/README index 99e9a52..9b5b7a9 100644 --- a/plugins/regex_remap/README +++ b/plugins/regex_remap/README @@ -19,7 +19,7 @@ traffic.out, typically in /usr/local/var/logs/trafficserver/traffic.out. In order to force a profile dump, you can do $ sudo touch /usr/local/etc/trafficserver/remap.config - $ sudo traffic_line -x + $ sudo traffic_ctl config reload By default, only the path and query string of the URL is http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c498d7e6/rc/trafficserver.service.in ---------------------------------------------------------------------- diff --git a/rc/trafficserver.service.in b/rc/trafficserver.service.in index 9026680..d200111 100644 --- a/rc/trafficserver.service.in +++ b/rc/trafficserver.service.in @@ -24,7 +24,7 @@ Type=simple EnvironmentFile=-/etc/sysconfig/trafficserver PIDFile=@exp_runtimedir@/cop.pid ExecStart=@exp_bindir@/traffic_cop $TC_DAEMON_ARGS -ExecReload=@exp_bindir@/traffic_line -x +ExecReload=@exp_bindir@/traffic_ctl config reload [Install] WantedBy=multi-user.target
