svn commit: r1100840 - /trafficserver/traffic/trunk/proxy/Main.cc

[zw...@apache.org]

Author: zwoop
Date: Sun May  8 23:23:26 2011
New Revision: 1100840

URL: http://svn.apache.org/viewvc?rev=1100840&view=rev
Log:
Cleanup on when to start ICP

Modified:
    trafficserver/traffic/trunk/proxy/Main.cc

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1100840&r1=1100839&r2=1100840&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Sun May  8 23:23:26 2011
@@ -1901,10 +1901,10 @@ main(int argc, char **argv)
 
     if (http_enabled) {
       start_HttpProxyServer(http_accept_file_descriptor, http_accept_port_number, ssl_accept_file_descriptor, num_accept_threads);
-    }
 #ifndef INK_NO_ICP
-    icpProcessor.start();
+      icpProcessor.start();
 #endif
+    }
 
     // "Task" processor, possibly with its own set of task threads
     tasksProcessor.start(num_task_threads);
@@ -1925,8 +1925,8 @@ main(int argc, char **argv)
     updateManager.start();
 
     void *mgmt_restart_shutdown_callback(void *, char *, int data_len);
-    pmgmt->registerMgmtCallback(MGMT_EVENT_SHUTDOWN, mgmt_restart_shutdown_callback, NULL);
 
+    pmgmt->registerMgmtCallback(MGMT_EVENT_SHUTDOWN, mgmt_restart_shutdown_callback, NULL);
     pmgmt->registerMgmtCallback(MGMT_EVENT_RESTART, mgmt_restart_shutdown_callback, NULL);
 
     Note("traffic server running");