diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 4cff5eed6..2a8135a09 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -788,17 +788,17 @@ :when: 2022-08-16 23:06:20.598551507 Z - - :approve - Monai.Deploy.Messaging - - :who: mocsharp + - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.11 + - 0.1.17-rc0020 :when: 2022-08-16 23:06:21.051573547 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - - :who: mocsharp + - :who: neilsouth :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.11 + - 0.1.17-rc0020 :when: 2022-08-16 23:06:21.511789690 Z - - :approve - Monai.Deploy.Storage diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index cf9fe77ca..cb68750ae 100644 --- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj +++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj index 50c855f54..b1d455ba4 100644 --- a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj +++ b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index d3ea51c0d..fc47c883b 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -48,7 +48,7 @@ - + diff --git a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs index c7d8a2395..ff044eaeb 100644 --- a/src/InformaticsGateway/Services/Export/ExportServiceBase.cs +++ b/src/InformaticsGateway/Services/Export/ExportServiceBase.cs @@ -99,7 +99,7 @@ protected ExportServiceBase( _messageSubscriber.OnConnectionError += (sender, args) => { - _logger.MessagingServiceErrorRecover(args.ShutdownEventArguments.ToString()); + _logger.MessagingServiceErrorRecover(args.ErrorMessage); SetupPolling(); }; } @@ -204,7 +204,7 @@ private void OnMessageReceivedCallback(MessageReceivedEventArgs eventArgs) private IEnumerable DownloadPayloadActionCallback(ExportRequestEventDetails exportRequest, CancellationToken cancellationToken) { Guard.Against.Null(exportRequest, nameof(exportRequest)); - using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } }); + using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } }); var scope = _serviceScopeFactory.CreateScope(); var storageService = scope.ServiceProvider.GetRequiredService(); @@ -245,7 +245,7 @@ private IEnumerable DownloadPayloadActionCallback(Expo private void ReportingActionBlock(ExportRequestDataMessage exportRequestData) { - using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } }); + using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } }); var exportRequest = _exportRequests[exportRequestData.ExportTaskId]; lock (SyncRoot) diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index 6c0816758..278934b90 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -1,4 +1,4 @@ -