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 9c3a0707c32876a4f2124afa541dfb628defde5d..cd031c99d5afe8e1d7da2b507a2ff455d7be6f59 100644 (file)
--- 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 8cb5b7ed6d1121a200873f856b7a151f556a0a90..34057204a5c0389fb35864191051253e2c2965a6 100644 (file)
--- 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 b1b8880abd3efc879615685a98b93696df71795d..06f18c77f173d89bc06b5b904f5270da4f5189ab 100644 (file)
--- 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
 }