From: Sage Weil <sage@newdream.net>
Date: Tue, 2 Nov 2010 20:00:26 +0000 (-0700)
Subject: config: fix sigsegv handler
X-Git-Tag: v0.23~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68f7fedea12a54982ff43b7436d7a3700a186ebd;p=ceph.git

config: fix sigsegv handler

Fixed this with sigabrt, forgot to do sigsegv too.

See 7a688a9f999a6b9d3bcdcbebbd8cd984afc70e31.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/config.cc b/src/config.cc
index bfb6c15f68e5..ec95de464403 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -1268,15 +1268,16 @@ void parse_config_options(std::vector<const char*>& args)
   }
 
   signal(SIGHUP, sighup_handler);
-  if (!old_sigsegv_handler)
+  if (!old_sigsegv_handler) {
     old_sigsegv_handler = signal(SIGSEGV, sigsegv_handler);
+    if (old_sigsegv_handler == sigsegv_handler)
+      old_sigsegv_handler = NULL;
+  }
   if (!old_sigabrt_handler) {
     old_sigabrt_handler = signal(SIGABRT, sigabrt_handler);
     if (old_sigabrt_handler == sigabrt_handler)
       old_sigabrt_handler = NULL;
-    //cout << "old_sigabrt_handler is " << (void*)old_sigabrt_handler << " new value is " << (void*)sigabrt_handler << std::endl;
-  } else {
-    //cout << "old_sigabrt_handler is " << (void*)old_sigabrt_handler << " didn't change" << std::endl;
   }
+
   args = nargs;
 }