From e2c5c00d1d7bbbb0f068554ff264eb80979b69a6 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 3 Oct 2022 09:03:36 -0700 Subject: [PATCH 1/2] gh-184 update messaging lib to fix RMQ connection issues Signed-off-by: Victor Chang --- src/Api/Monai.Deploy.InformaticsGateway.Api.csproj | 2 +- .../Monai.Deploy.InformaticsGateway.Configuration.csproj | 2 +- .../Monai.Deploy.InformaticsGateway.csproj | 2 +- .../Services/Connectors/PayloadNotificationActionHandler.cs | 5 ++--- src/InformaticsGateway/appsettings.Development.json | 2 +- .../Monai.Deploy.InformaticsGateway.Integration.Test.csproj | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj index fb715cda0..116e3cbfa 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 47241673e..8b45a0cbb 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 7a31a6b38..119f60bbf 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs index 4a50c3fd7..0ddb5daad 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs @@ -46,7 +46,6 @@ internal class PayloadNotificationActionHandler : IPayloadNotificationActionHand private readonly IOptions _options; private readonly IServiceScope _scope; - private readonly IMessageBrokerPublisherService _messageBrokerPublisherService; private bool _disposedValue; public PayloadNotificationActionHandler(IServiceScopeFactory serviceScopeFactory, @@ -58,7 +57,6 @@ public PayloadNotificationActionHandler(IServiceScopeFactory serviceScopeFactory _options = options ?? throw new ArgumentNullException(nameof(options)); _scope = _serviceScopeFactory.CreateScope(); - _messageBrokerPublisherService = _scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService)); } public async Task NotifyAsync(Payload payload, ActionBlock notificationQueue, CancellationToken cancellationToken = default) @@ -134,7 +132,8 @@ private async Task NotifyPayloadReady(Payload payload) _logger.PublishingWorkflowRequest(message.MessageId); - await _messageBrokerPublisherService.Publish( + var messageBrokerPublisherService = _scope.ServiceProvider.GetService() ?? throw new ServiceNotFoundException(nameof(IMessageBrokerPublisherService)); + await messageBrokerPublisherService.Publish( _options.Value.Messaging.Topics.WorkflowRequest, message.ToMessage()).ConfigureAwait(false); diff --git a/src/InformaticsGateway/appsettings.Development.json b/src/InformaticsGateway/appsettings.Development.json index 2ac189a44..adb443ca5 100644 --- a/src/InformaticsGateway/appsettings.Development.json +++ b/src/InformaticsGateway/appsettings.Development.json @@ -28,7 +28,7 @@ }, "storage": { "settings": { - "endpoint": "localhost", + "endpoint": "localhost:9000", "accessKey": "minioadmin", "accessToken": "minioadmin", "securedConnection": false diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index e794d68b9..606f97f99 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -33,7 +33,7 @@ - + From aa7b8095e39c94ee6013b878d369c768a271dde5 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 3 Oct 2022 09:41:47 -0700 Subject: [PATCH 2/2] Update licenses Signed-off-by: Victor Chang --- doc/dependency_decisions.yml | 5 ++--- docs/compliance/third-party-licenses.md | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 247a1b048..377dbe246 100644 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -815,14 +815,14 @@ - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.5 + - 0.1.6 :when: 2022-08-16 23:06:21.051573547 Z - - :approve - Monai.Deploy.Messaging.RabbitMQ - :who: mocsharp :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) :versions: - - 0.1.5 + - 0.1.6 :when: 2022-08-16 23:06:21.511789690 Z - - :approve - Monai.Deploy.Storage @@ -2377,4 +2377,3 @@ :versions: - 4.0.1 :when: 2022-08-16 23:10:21.184627612 Z - \ No newline at end of file diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md index b1f8daa85..927721d05 100644 --- a/docs/compliance/third-party-licenses.md +++ b/docs/compliance/third-party-licenses.md @@ -7286,14 +7286,14 @@ Apache License
-Monai.Deploy.Messaging 0.1.5 +Monai.Deploy.Messaging 0.1.6 ## Monai.Deploy.Messaging -- Version: 0.1.5 +- Version: 0.1.6 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.5) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging/0.1.6) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE) @@ -7514,14 +7514,14 @@ By downloading this software, you agree to the license terms & all licenses list
-Monai.Deploy.Messaging.RabbitMQ 0.1.5 +Monai.Deploy.Messaging.RabbitMQ 0.1.6 ## Monai.Deploy.Messaging.RabbitMQ -- Version: 0.1.5 +- Version: 0.1.6 - Authors: MONAI Consortium - Project URL: https://github.com/Project-MONAI/monai-deploy-messaging -- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.5) +- Source: [NuGet](https://www.nuget.org/packages/Monai.Deploy.Messaging.RabbitMQ/0.1.6) - License: [Apache-2.0](https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)