From: Sage Weil <sage@inktank.com>
Date: Thu, 30 May 2013 00:54:17 +0000 (-0700)
Subject: mon: return instead of exit(3) via preforker
X-Git-Tag: v0.64~33^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c5706163b72245768958155d767abf561e6d96d;p=ceph.git

mon: return instead of exit(3) via preforker

This lets us run all the locally-scoped dtors so that leak checking will
work.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 409aa45175ce..1a83db1ce44a 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -543,6 +543,6 @@ int main(int argc, const char **argv)
     dout(0) << "ceph-mon: gmon.out should be in " << s << dendl;
   }
 
-  prefork.exit(0);
+  return prefork.exit(0);
 }
 
diff --git a/src/common/Preforker.h b/src/common/Preforker.h
index bda5771d37b5..bf76e1891463 100644
--- a/src/common/Preforker.h
+++ b/src/common/Preforker.h
@@ -76,12 +76,12 @@ public:
     return r;
   }
 
-  void exit(int r) {
+  int exit(int r) {
     if (forked) {
       // tell parent
       (void)::write(fd[1], &r, sizeof(r));
     }
-    ::exit(r);
+    return r;
   }
 
   void daemonize() {