Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upped messaging version #260

Merged
merged 3 commits into from
Nov 16, 2022
Merged

upped messaging version #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b752a7a
upped messaging version
neildsouth Nov 15, 2022
8e16111
fixed up missed log
neildsouth Nov 15, 2022
c9dd62b
upped package version
neildsouth Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/dependency_decisions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PackageReference>
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.10" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.11" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.17-rc0020" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.11" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.17-rc0020" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.11" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.17-rc0020" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.10" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />
Expand Down
6 changes: 3 additions & 3 deletions src/InformaticsGateway/Services/Export/ExportServiceBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ protected ExportServiceBase(

_messageSubscriber.OnConnectionError += (sender, args) =>
{
_logger.MessagingServiceErrorRecover(args.ShutdownEventArguments.ToString());
_logger.MessagingServiceErrorRecover(args.ErrorMessage);
SetupPolling();
};
}
Expand Down Expand Up @@ -204,7 +204,7 @@ private void OnMessageReceivedCallback(MessageReceivedEventArgs eventArgs)
private IEnumerable<ExportRequestDataMessage> DownloadPayloadActionCallback(ExportRequestEventDetails exportRequest, CancellationToken cancellationToken)
{
Guard.Against.Null(exportRequest, nameof(exportRequest));
using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } });
using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } });
var scope = _serviceScopeFactory.CreateScope();
var storageService = scope.ServiceProvider.GetRequiredService<IStorageService>();

Expand Down Expand Up @@ -245,7 +245,7 @@ private IEnumerable<ExportRequestDataMessage> DownloadPayloadActionCallback(Expo

private void ReportingActionBlock(ExportRequestDataMessage exportRequestData)
{
using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } });
using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } });

var exportRequest = _exportRequests[exportRequestData.ExportTaskId];
lock (SyncRoot)
Expand Down
4 changes: 2 additions & 2 deletions tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
~ Copyright 2022 MONAI Consortium
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Minio" Version="4.0.6" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.11" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.17-rc0020" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.10" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="Polly" Version="7.2.3" />
Expand Down