trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject trafficserver git commit: Partially revert TS-3104
Date Fri, 12 Jun 2015 04:30:01 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master ba0306c35 -> 3a9a48910


Partially revert TS-3104


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3a9a4891
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3a9a4891
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3a9a4891

Branch: refs/heads/master
Commit: 3a9a489108368ceb7ee9c23a867303c481f753dd
Parents: ba0306c
Author: James Peach <jpeach@apache.org>
Authored: Thu Jun 11 21:29:56 2015 -0700
Committer: James Peach <jpeach@apache.org>
Committed: Thu Jun 11 21:29:56 2015 -0700

----------------------------------------------------------------------
 cmd/traffic_cop/traffic_cop.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3a9a4891/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 94ccdb4..7adf89f 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -132,9 +132,6 @@ static int child_pid = 0;
 static int child_status = 0;
 static int sem_id = 11452;
 
-// manager API is initialized
-static bool mgmt_init = false;
-
 AppVersionInfo appVersionInfo;
 
 static char const localhost[] = "127.0.0.1";
@@ -1207,7 +1204,6 @@ test_mgmt_cli_port()
 
   if (TSRecordGetString("proxy.config.manager_binary", &val) != TS_ERR_OKAY) {
     cop_log(COP_WARNING, "(cli test) unable to retrieve manager_binary\n");
-    mgmt_init = false;
     ret = -1;
   } else {
     if (strcmp(val, manager_binary) != 0) {
@@ -1610,6 +1606,7 @@ check_no_run()
 static void *
 check(void *arg)
 {
+  bool mgmt_init = false;
   cop_log_trace("Entering check()\n");
 
   for (;;) {
@@ -1658,10 +1655,7 @@ check(void *arg)
     // We do this after the first round of checks, since the first "check" will spawn traffic_manager
     if (!mgmt_init) {
       ats_scoped_str runtimedir(config_read_runtime_dir());
-
-      cop_log(COP_DEBUG, "initializing manager API\n");
       TSInit(runtimedir, static_cast<TSInitOptionT>(TS_MGMT_OPT_NO_EVENTS));
-
       mgmt_init = true;
 
       // Allow a configurable longer sleep init time


Mime
View raw message