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 3dddbf1467731472e4832a1f51fcb8f9c3be5e68..cbc04c7084c6614a7be493ce460c18586b5bce27 100644 (file)
--- 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;
 }