diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-09-25 14:35:54 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-09-25 14:35:54 -0400 |
| commit | 953a5cafdfc5bf8c103efa412958d3f1e0bb9c03 (patch) | |
| tree | 73d5f30c4972eb6efaeb960d95336d4839ea1878 /cpp/src/IceGrid/Parser.cpp | |
| parent | ICE-5503 android library demo does not update info on exception properly (diff) | |
| download | ice-953a5cafdfc5bf8c103efa412958d3f1e0bb9c03.tar.bz2 ice-953a5cafdfc5bf8c103efa412958d3f1e0bb9c03.tar.xz ice-953a5cafdfc5bf8c103efa412958d3f1e0bb9c03.zip | |
ICE-2400: LoggerAdmin implementation in Java and C# + various fixes to C++ implementation
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 75b1153109f..7f21e633e5c 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -243,6 +243,7 @@ const char* _commandsHelp[][3] = { { 0, 0, 0 } }; +int loggerCallbackCount = 0; void writeMessage(const string& message, bool indent) { @@ -2422,7 +2423,9 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow, _session->ice_getConnection()->setAdapter(adapter); Ice::Identity id; - id.name = "RemoteLogger-" + IceUtil::generateUUID(); + ostringstream name; + name << "RemoteLogger-" << loggerCallbackCount++; + id.name = name.str(); id.category = adminCallbackTemplate->ice_getIdentity().category; RemoteLoggerIPtr servant = new RemoteLoggerI; @@ -2452,10 +2455,6 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow, { // ignored } - catch(const Ice::RemoteLoggerNotAttachedException&) - { - // ignored - } } else { |