summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-20 08:37:26 -0700
committerSage Weil <sage@inktank.com>2013-07-20 08:37:26 -0700
commit868b48634be46c74f8e26e6a1c2ebc2d2b3beb9a (patch)
tree7144ecd7c76d2adf80bcda504c1637727d54e116
parentb084a3877f3b585a6b387f42d625b33c9b759435 (diff)
downloadceph-868b48634be46c74f8e26e6a1c2ebc2d2b3beb9a.tar.gz
mon: install signal handlers after init
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/ceph_mon.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 6ac22ba20e5..f247de8cdfb 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -542,16 +542,16 @@ int main(int argc, const char **argv)
if (g_conf->daemonize)
prefork.daemonize();
+ messenger->start();
+
+ mon->init();
+
// set up signal handlers, now that we've daemonized/forked.
init_async_signal_handler();
register_async_signal_handler(SIGHUP, sighup_handler);
register_async_signal_handler_oneshot(SIGINT, handle_mon_signal);
register_async_signal_handler_oneshot(SIGTERM, handle_mon_signal);
- messenger->start();
-
- mon->init();
-
messenger->wait();
unregister_async_signal_handler(SIGHUP, sighup_handler);