From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 11 Jul 2008 19:17:50 +0000 (+0200)
Subject: More cache manager initialization calls reshuffling.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf0eda483fcc33045ec2838a216aeaf07a2e38c;p=thirdparty%2Fsquid.git

More cache manager initialization calls reshuffling.
---

diff --git a/src/access_log.cc b/src/access_log.cc
index 7b44d7de6c..c1f63a3241 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1559,6 +1559,9 @@ void
 accessLogInit(void)
 {
     customlog *log;
+
+    accessLogRegisterWithCacheManager();
+
     assert(sizeof(log_tags) == (LOG_TYPE_MAX + 1) * sizeof(char *));
 
     for (log = Config.Log.accesslogs; log; log = log->next) {
@@ -1614,9 +1617,7 @@ void
 accessLogRegisterWithCacheManager()
 {
 #if FORW_VIA_DB
-
     fvdbRegisterWithCacheManager();
-
 #endif
 }
 
@@ -1648,7 +1649,7 @@ fvdbInit(void)
 }
 
 static void
-fvdbRegisterWithCacheManager()
+fvdbRegisterWithCacheManager(void)
 {
     CacheManager *manager=CacheManager::GetInstance();
     manager->registerAction("via_headers", "Via Request Headers", fvdbDumpVia, 0, 1);
diff --git a/src/main.cc b/src/main.cc
index 3461bfcc97..bb0fd913a2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -964,7 +964,7 @@ mainInitialize(void)
 
         FwdState::initModule();
         /* register the modules in the cache manager menus */
-        accessLogRegisterWithCacheManager();
+        // accessLogRegisterWithCacheManager(); //moved to accessLogInit()
         // asnRegisterWithCacheManager(); //moved to asnInit()
         authenticateRegisterWithCacheManager(&Config.authConfiguration);
 #if USE_CARP