svn commit: r908124 - /incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc

[ge...@apache.org]

Author: georgep
Date: Tue Feb  9 17:33:32 2010
New Revision: 908124

URL: http://svn.apache.org/viewvc?rev=908124&view=rev
Log:
TS-155: Disable/Comment out unused RNI code paths in Traffic Cop.
Review: Leif H.

Modified:
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc

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=908124&r1=908123&r2=908124&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Tue Feb  9 17:33:32 2010
@@ -79,7 +79,7 @@
 static int syslog_facility = LOG_DAEMON;
 static char syslog_fac_str[PATH_MAX];
 
-static int rni_killsig = SIGTERM;
+//static int rni_killsig = SIGTERM;
 static int killsig = SIGKILL;
 static int coresig = 0;
 
@@ -101,6 +101,7 @@
 static int server_failures = 0;
 static int server_not_found = 0;
 
+#if 0 // TODO: REMOVE RNI
 // connect to proxy port and hand it the RTSP port
 static time_t rni_last_restart = 0;
 static int rni_proxy_start_succeed = 1;
@@ -116,6 +117,7 @@
 static char rni_rpass_lockfile[PATH_MAX];
 static char rni_rpass_restart_cmd[PATH_MAX] = "";
 static char rni_rpass_binary[PATH_MAX] = "";
+#endif
 
 static const int sleep_time = 10;       // 10 sec
 static const int manager_timeout = 3 * 60;      //  3 min
@@ -138,10 +140,12 @@
 
 static const int kill_timeout = 1 * 60; //  1 min
 
+#if 0 // TODO: REMOVE RNI
 #define DEFAULT_RNI_RESTART_INTERVAL 20 // 20 seconds
 static int rni_restart_interval = DEFAULT_RNI_RESTART_INTERVAL;
 #define DEFAULT_RNI_RPASS_SWITCH_INTERVAL 60
 static int rni_rpass_switch_interval = DEFAULT_RNI_RPASS_SWITCH_INTERVAL;
+#endif
 
 static int child_pid = 0;
 static int child_status = 0;
@@ -613,6 +617,7 @@
   exit(1);
 }
 
+#if 0 // Used by RNI
 // extract the binary name from a cmd
 static void
 get_binary_from_cmd(char *cmdline, char *binary)
@@ -639,6 +644,7 @@
   cop_log(COP_DEBUG, "Leaving get_binary_from_cmd(%s, <%s>)\n", cmdline, binary);
 #endif
 }
+#endif
 
 static void
 read_config()
@@ -723,6 +729,7 @@
   read_config_int("proxy.config.cop.linux_min_swapfree_kb", &check_memory_min_swapfree_kb);
   read_config_int("proxy.config.cop.linux_min_memfree_kb", &check_memory_min_memfree_kb);
 
+#if 0 // TODO: REMOVE RNI
   // Real Networks stuff
   read_config_int("proxy.config.rni.watcher_enabled", &rni_watcher_enabled);
   if (rni_watcher_enabled) {
@@ -749,11 +756,13 @@
       get_binary_from_cmd(rni_rpass_restart_cmd, rni_rpass_binary);
     }
   }
+#endif
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Leaving read_config()\n");
 #endif
 }
 
+#if 0 // Used by RNI
 //
 // Get process ID in file
 //
@@ -831,6 +840,7 @@
 #endif
   return 0;
 }
+#endif
 
 static void
 spawn_manager()
@@ -932,6 +942,7 @@
 #endif
 }
 
+#if 0 // TODO: REMOVE RNI
 //
 // Spawn G2 Real Server
 //
@@ -1139,7 +1150,7 @@
   }
 }
 
-
+#endif // TODO: REMOVE RNI
 
 
 static int
@@ -1727,7 +1738,7 @@
   }
 }
 
-
+#if 0 // TODO: REMOVE RNI
 //
 // Check health status for G2 Real Server
 //
@@ -1782,6 +1793,7 @@
   }
 #endif
 }
+#endif // TODO: REMOVE RNI
 
 //         |  state  |  status  |  action
 // --------|---------|----------|---------------
@@ -1803,11 +1815,12 @@
 {
   int err;
   pid_t holding_pid;
-  pid_t rni_pid;
 
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Entering check_programs()\n");
 #endif
+#if 0 // TODO: REMOVE RNI
+  pid_t rni_pid;
   if (rni_last_restart > 0) {
     rni_pid = getholding_pid(rni_proxy_pid_path);
     if (rni_pid == 0 || kill(rni_pid, 0) == -1) {
@@ -1838,6 +1851,8 @@
   if (rni_rpass_watcher_enabled && !rni_proxy_start_succeed) {
     check_rpass();
   }
+#endif // TODO: REMOVE RNI
+
   // Try to get the manager lock file. If we succeed in doing this,
   // it means there is no manager running.
   Lockfile manager_lf(manager_lockfile);
@@ -2276,8 +2291,9 @@
   snprintf(cop_lockfile, sizeof(cop_lockfile), "%s%s%s", local_state_dir, DIR_SEP, COP_LOCK);
   snprintf(manager_lockfile, sizeof(manager_lockfile), "%s%s%s", local_state_dir, DIR_SEP, MANAGER_LOCK);
   snprintf(server_lockfile, sizeof(server_lockfile), "%s%s%s", local_state_dir, DIR_SEP, SERVER_LOCK);
+#if 0 // TODO: REMOVE RNI
   snprintf(rni_rpass_lockfile, sizeof(rni_rpass_lockfile), "%s%s%s", local_state_dir, DIR_SEP, RNI_RPASS_LOCK);
-
+#endif
 
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Leaving init_lockfiles()\n");