From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 11 Jul 2008 12:01:55 +0000 (+0200)
Subject: Moved asndb registration with Cache Manager from main to asn initialization.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99dfb6002c747a882a0ea2a2fad1b2e363c270b1;p=thirdparty%2Fsquid.git

Moved asndb registration with Cache Manager from main to asn initialization.
Fixed missing refactoring of initialization in netdb.
---

diff --git a/src/asn.cc b/src/asn.cc
index 9c3a0707c3..cd031c99d5 100644
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -195,6 +195,8 @@ asnInit(void)
         squid_rn_init();
 
     squid_rn_inithead(&AS_tree_head, 8);
+
+    asnRegisterWithCacheManager();
 }
 
 void
diff --git a/src/main.cc b/src/main.cc
index 8cb5b7ed6d..34057204a5 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -965,7 +965,7 @@ mainInitialize(void)
         FwdState::initModule();
         /* register the modules in the cache manager menus */
         accessLogRegisterWithCacheManager();
-        asnRegisterWithCacheManager();
+        // asnRegisterWithCacheManager(); //moved to asnInit()
         authenticateRegisterWithCacheManager(&Config.authConfiguration);
 #if USE_CARP
 
diff --git a/src/net_db.cc b/src/net_db.cc
index b1b8880abd..06f18c77f1 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -916,10 +916,8 @@ void
 netdbRegisterWitHCacheManager(void)
 {
 #if USE_ICMP
-    manager.registerAction("netdb",
-                           "Network Measurement Database",
-                           netdbDump, 0, 1);
-
+    CacheManager::GetInstance()->
+        registerAction("netdb", "Network Measurement Database", netdbDump, 0, 1);
 #endif
 }