diff options
| author | Jose <jose@zeroc.com> | 2016-07-22 17:57:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-22 17:57:42 +0200 |
| commit | b55c347b5178f62db2a175b55900217217a46dbc (patch) | |
| tree | 914e89427afe92828aac9d01c0a2d7b4046e751a /csharp/src/Ice/LoggerAdminLoggerI.cs | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-b55c347b5178f62db2a175b55900217217a46dbc.tar.bz2 ice-b55c347b5178f62db2a175b55900217217a46dbc.tar.xz ice-b55c347b5178f62db2a175b55900217217a46dbc.zip | |
CSharp AMD mapping update
Diffstat (limited to 'csharp/src/Ice/LoggerAdminLoggerI.cs')
| -rw-r--r-- | csharp/src/Ice/LoggerAdminLoggerI.cs | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/csharp/src/Ice/LoggerAdminLoggerI.cs b/csharp/src/Ice/LoggerAdminLoggerI.cs index b80f75e25fc..221358a7243 100644 --- a/csharp/src/Ice/LoggerAdminLoggerI.cs +++ b/csharp/src/Ice/LoggerAdminLoggerI.cs @@ -171,7 +171,31 @@ sealed class LoggerAdminLoggerI : LoggerAdminLogger // // p is a proxy associated with the _sendLogCommunicator // - p.begin_log(job.logMessage, logCompleted, null); + p.logAsync(job.logMessage).ContinueWith( + (t) => + { + try + { + t.Wait(); + if(_loggerAdmin.getTraceLevel() > 1) + { + _localLogger.trace(_traceCategory, "log on `" + p.ToString() + + "' completed successfully"); + } + } + catch(AggregateException ae) + { + if(ae.InnerException is Ice.CommunicatorDestroyedException) + { + // expected if there are outstanding calls during communicator destruction + } + if(ae.InnerException is Ice.LocalException) + { + _loggerAdmin.deadRemoteLogger(p, _localLogger, + (Ice.LocalException)ae.InnerException, "log"); + } + } + }); } catch(Ice.LocalException ex) { |