From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 1 May 2015 05:12:49 +0000 (+0800)
Subject: ceph_mon: output preforker error message
X-Git-Tag: v9.0.1~26^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de5717eb9a6d8c8ff7a63b7c9eb039360f7a395b;p=ceph.git

ceph_mon: output preforker error message

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index e0ca6e278c66..42c67b58302d 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -497,9 +497,17 @@ int main(int argc, const char **argv)
   Preforker prefork;
   if (!(flags & CINIT_FLAG_NO_DAEMON_ACTIONS)) {
     if (global_init_prefork(g_ceph_context, 0) >= 0) {
-      prefork.prefork();
+      string err_msg;
+      err = prefork.prefork(err_msg);
+      if (err < 0) {
+        cerr << err_msg << std::endl;
+        prefork.exit(err);
+      }
       if (prefork.is_parent()) {
-	return prefork.parent_wait();
+        err = prefork.parent_wait(err_msg);
+        if (err < 0)
+          cerr << err_msg << std::endl;
+        prefork.exit(err);
       }
       global_init_postfork_start(g_ceph_context);
     }