diff options
Diffstat (limited to 'slobrok/src')
-rw-r--r-- | slobrok/src/apps/slobrok/slobrok.cpp | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp index e69f2df53f0..0588c90d383 100644 --- a/slobrok/src/apps/slobrok/slobrok.cpp +++ b/slobrok/src/apps/slobrok/slobrok.cpp @@ -94,10 +94,6 @@ App::Main() LOG(error, "unknown exception during construction : %s", e.what()); EV_STOPPING("slobrok", "unknown exception during construction"); return 2; - } catch (...) { - LOG(error, "unknown exception during construction"); - EV_STOPPING("slobrok", "unknown exception during construction"); - return 3; } mainobj.reset(); return res; diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 163113de7b9..4e510b61e70 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -190,9 +190,9 @@ SBEnv::MainLoop() LOG(error, "invalid config: %s", e.what()); EV_STOPPING("slobrok", "invalid config"); return 1; - } catch (...) { - LOG(error, "unknown exception while configuring"); - EV_STOPPING("slobrok", "unknown config exception"); + } catch (std::exception &e) { + LOG(error, "Unexpected std::exception : %s", e.what()); + EV_STOPPING("slobrok", "Unexpected std::exception"); return 1; } EV_STOPPING("slobrok", "clean shutdown"); |