]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
client: fix logger deregistration
authorSage Weil <sage@newdream.net>
Thu, 15 Dec 2011 01:43:18 +0000 (17:43 -0800)
committerSage Weil <sage@newdream.net>
Thu, 15 Dec 2011 01:43:18 +0000 (17:43 -0800)
Only unregister logger if it is non-NULL (and thus registered) to avoid
running afoul of the cct assertions.

Signed-off-by: Sage Weil <sage@newdream.net>
src/client/Client.cc

index a68cf95b0755afaaf82422c8c9e8ee06167eb2c1..7c8b771907fe6906d3e45d0a5518766c4a9dbe38 100644 (file)
@@ -313,9 +313,11 @@ void Client::shutdown()
   monclient->shutdown();
   messenger->shutdown();
 
-  cct->get_perfcounters_collection()->remove(logger);
-  delete logger;
-  logger = NULL;
+  if (logger) {
+    cct->get_perfcounters_collection()->remove(logger);
+    delete logger;
+    logger = NULL;
+  }
 }