You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ni...@apache.org on 2013/07/16 01:58:19 UTC

git commit: TS-2036: register plugin callbacks at startup also switch from #ifndef to #ifdef to reduce confusion that probably gave rise to the bug in the first place.

Updated Branches:
  refs/heads/master 224cc0c76 -> 37394aa00


TS-2036: register plugin callbacks at startup
also switch from #ifndef to #ifdef to reduce confusion that probably
gave rise to the bug in the first place.


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

Branch: refs/heads/master
Commit: 37394aa002485f27505654447d172ca2f1f2af92
Parents: 224cc0c
Author: niq <ni...@apache.org>
Authored: Tue Jul 16 00:36:39 2013 +0100
Committer: niq <ni...@apache.org>
Committed: Tue Jul 16 00:53:00 2013 +0100

----------------------------------------------------------------------
 proxy/Main.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/37394aa0/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index 0213bec..1f8d269 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -1627,11 +1627,11 @@ main(int /* argc ATS_UNUSED */, char **argv)
 #endif
     }
 
-#ifndef TS_NO_API
-    plugin_init(system_config_directory);        // plugin.config
-#else
+#ifdef TS_NO_API
     api_init();                 // we still need to initialize some of the data structure other module needs.
     // i.e. http_global_hooks
+#else
+    plugin_init(system_config_directory);        // plugin.config
     pmgmt->registerPluginCallbacks(global_config_cbs);
 #endif