trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1089709 - in /trafficserver/traffic/trunk: cop/TrafficCop.cc mgmt/RecordsConfig.cc mgmt/web2/WebIntrMain.cc proxy/ReverseProxy.cc proxy/config/records.config.default.in proxy/http/remap/UrlRewrite.cc
Date Thu, 07 Apr 2011 02:17:19 GMT
Author: zwoop
Date: Thu Apr  7 02:17:19 2011
New Revision: 1089709

URL: http://svn.apache.org/viewvc?rev=1089709&view=rev
Log:
Restore the config name autoconf_port, to avoid confusion

Modified:
    trafficserver/traffic/trunk/cop/TrafficCop.cc
    trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
    trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
    trafficserver/traffic/trunk/proxy/ReverseProxy.cc
    trafficserver/traffic/trunk/proxy/config/records.config.default.in
    trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc

Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Thu Apr  7 02:17:19 2011
@@ -670,7 +670,7 @@ read_config()
   read_config_string("proxy.config.output.logfile", log_filename, sizeof(log_filename));
   Layout::relative_to(log_file, sizeof(log_file), log_dir, log_filename);
   read_config_int("proxy.config.process_manager.mgmt_port", &http_backdoor_port);
-  read_config_int("proxy.config.admin.autoconf.port", &autoconf_port);
+  read_config_int("proxy.config.admin.autoconf_port", &autoconf_port);
   read_config_int("proxy.config.cluster.rsport", &rs_port);
   read_config_int("proxy.config.lm.sem_id", &sem_id);
 

Modified: trafficserver/traffic/trunk/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/RecordsConfig.cc?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/RecordsConfig.cc Thu Apr  7 02:17:19 2011
@@ -246,7 +246,7 @@ RecordElement RecordsConfig[] = {
   ,
   {RECT_CONFIG, "proxy.config.cluster.log_bogus_mc_msgs", RECD_INT, "1", RECU_NULL, RR_NULL,
RECC_NULL, NULL, RECA_NULL}
   ,
-  {RECT_CONFIG, "proxy.config.admin.autoconf.port", RECD_INT, "8083", RECU_RESTART_TM, RR_REQUIRED,
RECC_INT, "[0-65535]", RECA_NULL}
+  {RECT_CONFIG, "proxy.config.admin.autoconf_port", RECD_INT, "8083", RECU_RESTART_TM, RR_REQUIRED,
RECC_INT, "[0-65535]", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.admin.autoconf.doc_root", RECD_STRING, "etc/trafficserver",
RECU_NULL, RR_REQUIRED, RECC_NULL, NULL, RECA_NULL}
   ,

Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Thu Apr  7 02:17:19 2011
@@ -404,7 +404,7 @@ webIntr_main(void *x)
   if (aconf_port_arg > 0) {
     publicPort = aconf_port_arg;
   } else {
-    found = (RecGetRecordInt("proxy.config.admin.autoconf.port", &tempInt) == REC_ERR_OKAY);
+    found = (RecGetRecordInt("proxy.config.admin.autoconf_port", &tempInt) == REC_ERR_OKAY);
     publicPort = (int) tempInt;
     ink_assert(found);
   }

Modified: trafficserver/traffic/trunk/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ReverseProxy.cc?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ReverseProxy.cc (original)
+++ trafficserver/traffic/trunk/proxy/ReverseProxy.cc Thu Apr  7 02:17:19 2011
@@ -81,7 +81,7 @@ init_reverse_proxy()
   REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.filename", url_rewrite_CB, (void
*) FILE_CHANGED);
   REVERSE_RegisterConfigUpdateFunc("proxy.config.proxy_name", url_rewrite_CB, (void *) TSNAME_CHANGED);
   REVERSE_RegisterConfigUpdateFunc("proxy.config.reverse_proxy.enabled", url_rewrite_CB,
(void *) REVERSE_CHANGED);
-  REVERSE_RegisterConfigUpdateFunc("proxy.config.admin.autoconf.port", url_rewrite_CB, (void
*) AC_PORT_CHANGED);
+  REVERSE_RegisterConfigUpdateFunc("proxy.config.admin.autoconf_port", url_rewrite_CB, (void
*) AC_PORT_CHANGED);
   REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac", url_rewrite_CB,
(void *) DEFAULT_TO_PAC_CHANGED);
   REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.default_to_server_pac_port", url_rewrite_CB,
(void *) DEFAULT_TO_PAC_PORT_CHANGED);
   REVERSE_RegisterConfigUpdateFunc("proxy.config.url_remap.url_remap_mode", url_rewrite_CB,
(void *) URL_REMAP_MODE_CHANGED);

Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Thu Apr  7 02:17:19
2011
@@ -55,7 +55,7 @@ CONFIG proxy.config.cluster.mcport INT 8
 CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
 CONFIG proxy.config.cluster.mc_ttl INT 1
 CONFIG proxy.config.cluster.log_bogus_mc_msgs INT 1
-CONFIG proxy.config.admin.autoconf.port INT 8083
+CONFIG proxy.config.admin.autoconf_port INT 8083
 CONFIG proxy.config.admin.admin_user STRING admin
 CONFIG proxy.config.admin.number_config_bak INT 3
 CONFIG proxy.config.admin.user_id STRING @pkgsysuser@

Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc?rev=1089709&r1=1089708&r2=1089709&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc Thu Apr  7 02:17:19 2011
@@ -516,7 +516,7 @@ UrlRewrite::UrlRewrite(const char *file_
   }
 
   REVERSE_ReadConfigInteger(reverse_proxy, "proxy.config.reverse_proxy.enabled");
-  REVERSE_ReadConfigInteger(mgmt_autoconf_port, "proxy.config.admin.autoconf.port");
+  REVERSE_ReadConfigInteger(mgmt_autoconf_port, "proxy.config.admin.autoconf_port");
   REVERSE_ReadConfigInteger(default_to_pac, "proxy.config.url_remap.default_to_server_pac");
   REVERSE_ReadConfigInteger(default_to_pac_port, "proxy.config.url_remap.default_to_server_pac_port");
   REVERSE_ReadConfigInteger(url_remap_mode, "proxy.config.url_remap.url_remap_mode");



Mime
View raw message