Refactored delay pools registration

diff --git a/src/DelayPools.h b/src/DelayPools.h
index 4d4c271361cc4deb7e7b1e5b4a334730d0a3e191..f9468fbf4b26eab4b21c9c63e8f0e7fce9dc1cda 100644 (file)
--- a/src/DelayPools.h
+++ b/src/DelayPools.h
@@ -64,7 +64,7 @@ class DelayPools
 
 public:
     static void Init();
-    static void RegisterWithCacheManager(CacheManager & manager);
+    static void RegisterWithCacheManager(void);
     static void Update(void *);
     static unsigned short pools();
     static void pools (u_short pools);

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 407726890f7b7133aa82e70fc20598a346ec91f8..254ac6e2f6bfe5ebf49430c6635089bf335f2e3c 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -556,9 +556,10 @@ DelayPools::Init()
 }
 
 void
-DelayPools::RegisterWithCacheManager(CacheManager & manager)
+DelayPools::RegisterWithCacheManager(void)
 {
-    manager.registerAction("delay", "Delay Pool Levels", Stats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("delay", "Delay Pool Levels", Stats, 0, 1);
 }
 
 void

diff --git a/src/main.cc b/src/main.cc
index ca452869661543606d17c833d68006a998686402..c638532c8ca7f6951fa1fc07795af5dbaf549691 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -999,7 +999,7 @@ mainInitialize(void)
         clientdbRegisterWithCacheManager();
 #if DELAY_POOLS
 
-        DelayPools::RegisterWithCacheManager(*manager);
+        DelayPools::RegisterWithCacheManager();
 #endif
 
         DiskIOModule::RegisterAllModulesWithCacheManager();