From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 13 Nov 2014 13:47:49 +0000 (+0100)
Subject: librados-config.cc: catch ceph::FailedAssertion exception
X-Git-Tag: v0.90~25^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f6b0910373c023e2280be3abf51ab7009a239f6;p=ceph.git

librados-config.cc: catch ceph::FailedAssertion exception

CID 717157 (#1-2): Uncaught exception (UNCAUGHT_EXCEPT)
 root_function: In function main(int, char const **) an exception
 of type ceph::FailedAssertion is thrown and never caught.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/librados-config.cc b/src/librados-config.cc
index ffe758129b86..210c14d0c167 100644
--- a/src/librados-config.cc
+++ b/src/librados-config.cc
@@ -42,10 +42,14 @@ int main(int argc, const char **argv)
   bool opt_version = false;
   bool opt_vernum = false;
 
-  global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,
-	      CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
-  common_init_finish(g_ceph_context);
-
+  try {
+    global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,
+		CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
+    common_init_finish(g_ceph_context);
+  } catch (ceph::FailedAssertion &a) {
+    cout << "ceph::FailedAssertion thrown, exit." << std::endl;
+    exit(1);
+  }
   for (std::vector<const char*>::iterator i = args.begin();
        i != args.end(); ) {
     if (strcmp(*i, "--") == 0) {