From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Sat, 11 Dec 2010 04:30:57 +0000 (-0800)
Subject: gceph: run shutdown functions at exit
X-Git-Tag: v0.25~464^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71a19a943261f6b5cf79e01142da48432a1835b3;p=ceph.git

gceph: run shutdown functions at exit

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---

diff --git a/src/tools/gceph.cc b/src/tools/gceph.cc
index 3dddbf146773..cbc04c7084c6 100644
--- a/src/tools/gceph.cc
+++ b/src/tools/gceph.cc
@@ -60,6 +60,12 @@ static int cephtool_run_gui(int argc, const char **argv)
   return run_gui(argc, (char **)argv);
 }
 
+void ceph_tool_common_shutdown_wrapper()
+{
+  ceph_tool_messenger_shutdown();
+  ceph_tool_common_shutdown();
+}
+
 int main(int argc, const char **argv)
 {
   int ret = 0;
@@ -83,14 +89,13 @@ int main(int argc, const char **argv)
     return 1;
   }
 
+  atexit(ceph_tool_common_shutdown_wrapper);
+
   if (cephtool_run_gui(argc, argv))
     ret = 1;
 
   if (ceph_tool_messenger_shutdown())
     ret = 1;
 
-  if (ceph_tool_common_shutdown())
-    ret = 1;
-
   return ret;
 }