You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/02/17 00:21:19 UTC
svn commit: r910762 - in /incubator/trafficserver/traffic/trunk/proxy/mgmt2:
RecordsConfig.cc cop/TrafficCop.cc web2/WebIntrMain.cc
Author: georgep
Date: Tue Feb 16 23:21:19 2010
New Revision: 910762
URL: http://svn.apache.org/viewvc?rev=910762&view=rev
Log:
TS-183: This patch '0001-TS183_patch1.diff.patch' disables the RAF and Overseer ports by default. Also sets the default ports in TC to be same as in TM and TS.
Review: Leif H.
Modified:
incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=910762&r1=910761&r2=910762&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Tue Feb 16 23:21:19 2010
@@ -330,7 +330,7 @@
RA_NULL}
,
// overseer_mode: 0 disabled, 1 monitor only (get), 2 full acces (get, set, reread, bounce, restart)
- {CONFIG, "proxy.config.admin.overseer_mode", "", INK_INT, "1", RU_RESTART_TM, RR_NULL, RC_INT, "[0-2]", RA_NULL}
+ {CONFIG, "proxy.config.admin.overseer_mode", "", INK_INT, "0", RU_RESTART_TM, RR_NULL, RC_INT, "[0-2]", RA_NULL}
,
{CONFIG, "proxy.config.admin.overseer_port", "", INK_INT, "9898", RU_NULL, RR_REQUIRED, RC_NULL, NULL,
RA_NULL}
@@ -3619,13 +3619,13 @@
//#
//# Remote Access Framework (RAF) config - (for integration into SF test harness)
//#
- //# ** TM raf is enabled by default with port 20098 (see am-1/tcl/common/defaults.tcl)
+ //# ** TM raf is *NOW* disabled by default with port 20098 (see am-1/tcl/common/defaults.tcl)
//##############################################################################
{CONFIG, "proxy.config.raf.enabled", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.raf.port", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.raf.manager.enabled", "", INK_INT, "1", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.raf.manager.enabled", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.raf.manager.port", "", INK_INT, "20098", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
,
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=910762&r1=910761&r2=910762&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Tue Feb 16 23:21:19 2010
@@ -92,9 +92,9 @@
static char log_file[PATH_MAX] = "logs/traffic.out";
static char bin_path[PATH_MAX] = "bin";
-static int autoconf_port = 8013;
-static int rs_port = 8018;
-static int http_backdoor_port = 8080;
+static int autoconf_port = 8083;
+static int rs_port = 8088;
+static int http_backdoor_port = 8084;
static char http_backdoor_ip[PATH_MAX];
static int manager_failures = 0;
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=910762&r1=910761&r2=910762&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Tue Feb 16 23:21:19 2010
@@ -712,7 +712,7 @@
int rec_err;
rec_err = RecGetRecordInt("proxy.config.admin.overseer_mode", &tempInt);
overseerMode = (int) tempInt;
- if ((rec_err != REC_ERR_OKAY) || overseerMode<1 || overseerMode> 2)
+ if ((rec_err != REC_ERR_OKAY) || overseerMode<0 || overseerMode> 2)
overseerMode = 2;
rec_err = RecGetRecordInt("proxy.config.admin.overseer_port", &tempInt);
overseerPort = (int) tempInt;