summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Service.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-06-09 23:56:51 +0200
committerJose <jose@zeroc.com>2017-06-09 23:56:51 +0200
commitf1501ac1aaacd05cc54bb394c70eadabe8ddde4c (patch)
treea4267d4b34a336f0ed939b4018363828f5ec6f32 /cpp/src/Ice/Service.cpp
parentFix (ICE-8002) - csharp/IceSSL/configuration on Window Server 2012 (diff)
downloadice-f1501ac1aaacd05cc54bb394c70eadabe8ddde4c.tar.bz2
ice-f1501ac1aaacd05cc54bb394c70eadabe8ddde4c.tar.xz
ice-f1501ac1aaacd05cc54bb394c70eadabe8ddde4c.zip
Improve Service exception messages
Diffstat (limited to 'cpp/src/Ice/Service.cpp')
-rw-r--r--cpp/src/Ice/Service.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 278b9831191..260ce660ed5 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -850,21 +850,21 @@ Ice::Service::run(int argc, const char* const argv[], const InitializationData&
catch(const std::exception& ex)
{
ServiceError err(this);
- err << "service caught unhandled exception:\n" << ex;
+ err << "service terminating after catching exception:\n" << ex;
}
catch(const std::string& msg)
{
ServiceError err(this);
- err << "service caught unhandled exception:\n" << msg;
+ err << "service terminating after catching exception:\n" << msg;
}
catch(const char* msg)
{
ServiceError err(this);
- err << "service caught unhandled exception:\n" << msg;
+ err << "service terminating after catching exception:\n" << msg;
}
catch(...)
{
- error("service caught unhandled C++ exception");
+ error("service terminating after catching unknown exception");
}
if(_communicator)
@@ -1372,11 +1372,11 @@ Ice::Service::serviceMain(int argc, const wchar_t* const argv[])
catch(const std::exception& ex)
{
ServiceError err(this);
- err << "service caught unhandled std::exception:\n" << ex;
+ err << "service terminating after catching exception:\n" << ex;
}
catch(...)
{
- error("service caught unhandled C++ exception");
+ error("service terminating after catching unknown exception");
}
delete[] args;
@@ -1820,12 +1820,12 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa
catch(const std::exception& ex)
{
ServiceError err(this);
- err << "service caught unhandled std::exception:\n" << ex;
+ err << "service terminating after catching exception:\n" << ex;
errMsg = err.str();
}
catch(...)
{
- errMsg = "service caught unhandled C++ exception";
+ errMsg = "service terminating after catching unknown exception";
error(errMsg);
}