Skip to content

Commit 7ad457a

Browse files
mocsharpmocsharp
authored
Clears payload at startup (#326)
* Fix Mongodb configuration where GUIDs are not deserialized correctly Remove pending payloads only when MachineName matches. * Update changelog Signed-off-by: Victor Chang <[email protected]>
1 parent 2831d3c commit 7ad457a

File tree

69 files changed

+1551
-1156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1551
-1156
lines changed

‎doc/dependency_decisions.yml

+31-37
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- :who: mocsharp
4040
:why: Apache-2.0 (https://github.com/castleproject/Core/raw/master/LICENSE)
4141
:versions:
42-
- 5.1.0
42+
- 5.1.1
4343
:when: 2022-08-16 23:05:30.666349504 Z
4444
- - :approve
4545
- ConsoleAppFramework
@@ -102,7 +102,7 @@
102102
- :who: mocsharp
103103
:why: MIT (https://github.com/GitTools/GitVersion/raw/main/LICENSE)
104104
:versions:
105-
- 5.11.1
105+
- 5.12.0
106106
:when: 2022-08-16 23:05:34.633372053 Z
107107
- - :approve
108108
- HL7-dotnetcore
@@ -319,70 +319,70 @@
319319
- :who: mocsharp
320320
:why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE)
321321
:versions:
322-
- 17.4.0
322+
- 17.4.1
323323
:when: 2022-08-16 23:05:48.342748414 Z
324324
- - :approve
325325
- Microsoft.Data.Sqlite.Core
326326
- :who: mocsharp
327327
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
328328
:versions:
329-
- 6.0.12
329+
- 6.0.13
330330
:when: 2022-08-16 23:05:49.698463427 Z
331331
- - :approve
332332
- Microsoft.EntityFrameworkCore
333333
- :who: mocsharp
334334
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
335335
:versions:
336-
- 6.0.12
336+
- 6.0.13
337337
:when: 2022-08-16 23:05:50.137694970 Z
338338
- - :approve
339339
- Microsoft.EntityFrameworkCore.Abstractions
340340
- :who: mocsharp
341341
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
342342
:versions:
343-
- 6.0.12
343+
- 6.0.13
344344
:when: 2022-08-16 23:05:51.008105271 Z
345345
- - :approve
346346
- Microsoft.EntityFrameworkCore.Analyzers
347347
- :who: mocsharp
348348
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
349349
:versions:
350-
- 6.0.12
350+
- 6.0.13
351351
:when: 2022-08-16 23:05:51.445711308 Z
352352
- - :approve
353353
- Microsoft.EntityFrameworkCore.Design
354354
- :who: mocsharp
355355
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
356356
:versions:
357-
- 6.0.12
357+
- 6.0.13
358358
:when: 2022-08-16 23:05:51.922790944 Z
359359
- - :approve
360360
- Microsoft.EntityFrameworkCore.InMemory
361361
- :who: mocsharp
362362
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
363363
:versions:
364-
- 6.0.12
364+
- 6.0.13
365365
:when: 2022-08-16 23:05:52.375150938 Z
366366
- - :approve
367367
- Microsoft.EntityFrameworkCore.Relational
368368
- :who: mocsharp
369369
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
370370
:versions:
371-
- 6.0.12
371+
- 6.0.13
372372
:when: 2022-08-16 23:05:52.828879230 Z
373373
- - :approve
374374
- Microsoft.EntityFrameworkCore.Sqlite
375375
- :who: mocsharp
376376
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
377377
:versions:
378-
- 6.0.12
378+
- 6.0.13
379379
:when: 2022-08-16 23:05:53.270526921 Z
380380
- - :approve
381381
- Microsoft.EntityFrameworkCore.Sqlite.Core
382382
- :who: mocsharp
383383
:why: MIT (https://raw.githubusercontent.com/dotnet/efcore/release/6.0/LICENSE.txt)
384384
:versions:
385-
- 6.0.12
385+
- 6.0.13
386386
:when: 2022-08-16 23:05:53.706997823 Z
387387
- - :approve
388388
- Microsoft.Extensions.ApiDescription.Server
@@ -524,23 +524,23 @@
524524
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
525525
:versions:
526526
- 6.0.11
527-
- 6.0.12
527+
- 6.0.13
528528
:when: 2022-08-29 18:11:22.090772006 Z
529529
- - :approve
530530
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions
531531
- :who: mocsharp
532532
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
533533
:versions:
534534
- 6.0.11
535-
- 6.0.12
535+
- 6.0.13
536536
:when: 2022-08-29 18:11:22.090772006 Z
537537
- - :approve
538538
- Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore
539539
- :who: mocsharp
540540
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
541541
:versions:
542542
- 6.0.11
543-
- 6.0.12
543+
- 6.0.13
544544
:when: 2022-08-29 18:11:22.090772006 Z
545545
- - :approve
546546
- Microsoft.Extensions.FileProviders.Abstractions
@@ -689,7 +689,7 @@
689689
- :who: mocsharp
690690
:why: MIT (https://raw.githubusercontent.com/microsoft/vstest/main/LICENSE)
691691
:versions:
692-
- 17.4.0
692+
- 17.4.1
693693
:when: 2022-09-01 23:06:13.008314524 Z
694694
- - :approve
695695
- Microsoft.NETCore.Platforms
@@ -739,14 +739,14 @@
739739
- :who: mocsharp
740740
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
741741
:versions:
742-
- 17.4.0
742+
- 17.4.1
743743
:when: 2022-08-16 23:06:16.175705981 Z
744744
- - :approve
745745
- Microsoft.TestPlatform.TestHost
746746
- :who: mocsharp
747747
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
748748
:versions:
749-
- 17.4.0
749+
- 17.4.1
750750
:when: 2022-08-16 23:06:17.671459450 Z
751751
- - :approve
752752
- Microsoft.Toolkit.HighPerformance
@@ -831,14 +831,8 @@
831831
:why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt)
832832
:versions:
833833
- 4.18.1
834+
- 4.18.4
834835
:when: 2022-08-16 23:06:23.359197359 Z
835-
- - :approve
836-
- Moq
837-
- :who: mocsharp
838-
:why: BSD 3-Clause License ( https://raw.githubusercontent.com/moq/moq4/main/License.txt)
839-
:versions:
840-
- 4.18.3
841-
:when: 2022-08-16 23:06:23.843184482 Z
842836
- - :approve
843837
- NETStandard.Library
844838
- :who: mocsharp
@@ -972,28 +966,28 @@
972966
- :who: mocsharp
973967
:why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
974968
:versions:
975-
- 6.4.0
969+
- 6.5.0
976970
:when: 2022-08-16 23:06:33.817705411 Z
977971
- - :approve
978972
- Swashbuckle.AspNetCore.Swagger
979973
- :who: mocsharp
980974
:why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
981975
:versions:
982-
- 6.4.0
976+
- 6.5.0
983977
:when: 2022-08-16 23:06:34.264757523 Z
984978
- - :approve
985979
- Swashbuckle.AspNetCore.SwaggerGen
986980
- :who: mocsharp
987981
:why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
988982
:versions:
989-
- 6.4.0
983+
- 6.5.0
990984
:when: 2022-08-16 23:06:34.716116883 Z
991985
- - :approve
992986
- Swashbuckle.AspNetCore.SwaggerUI
993987
- :who: mocsharp
994988
:why: MIT (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
995989
:versions:
996-
- 6.4.0
990+
- 6.5.0
997991
:when: 2022-08-16 23:06:35.164249703 Z
998992
- - :approve
999993
- System.AppContext
@@ -2222,7 +2216,7 @@
22222216
- :who: mocsharp
22232217
:why: MIT (https://github.com/JoshKeegan/xRetry/raw/master/LICENSE)
22242218
:versions:
2225-
- 1.8.0
2219+
- 1.9.0
22262220
:when: 2022-08-16 23:07:57.794503140 Z
22272221
- - :approve
22282222
- xunit
@@ -2341,21 +2335,21 @@
23412335
- :who: mocsharp
23422336
:why: BSD 3-Clause License (https://github.com/NLog/NLog/raw/dev/LICENSE.txt)
23432337
:versions:
2344-
- 5.1.0
2338+
- 5.1.1
23452339
:when: 2022-10-12 03:14:06.538744982 Z
23462340
- - :approve
23472341
- NLog.Extensions.Logging
23482342
- :who: mocsharp
23492343
:why: BSD 2-Clause Simplified License (https://github.com/NLog/NLog.Extensions.Logging/raw/master/LICENSE)
23502344
:versions:
2351-
- 5.2.0
2345+
- 5.2.1
23522346
:when: 2022-10-12 03:14:06.964203977 Z
23532347
- - :approve
23542348
- NLog.Web.AspNetCore
23552349
- :who: mocsharp
23562350
:why: BSD 3-Clause License (https://github.com/NLog/NLog.Web/raw/master/LICENSE)
23572351
:versions:
2358-
- 5.2.0
2352+
- 5.2.1
23592353
:when: 2022-10-12 03:14:07.396706995 Z
23602354
- - :approve
23612355
- fo-dicom.NLog
@@ -2397,28 +2391,28 @@
23972391
- :who: mocsharp
23982392
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
23992393
:versions:
2400-
- 2.18.0
2394+
- 2.19.0
24012395
:when: 2022-11-16 23:38:53.891380809 Z
24022396
- - :approve
24032397
- MongoDB.Driver
24042398
- :who: mocsharp
24052399
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
24062400
:versions:
2407-
- 2.18.0
2401+
- 2.19.0
24082402
:when: 2022-11-16 23:38:54.213853364 Z
24092403
- - :approve
24102404
- MongoDB.Driver.Core
24112405
- :who: mocsharp
24122406
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
24132407
:versions:
2414-
- 2.18.0
2408+
- 2.19.0
24152409
:when: 2022-11-16 23:38:54.553730219 Z
24162410
- - :approve
24172411
- MongoDB.Libmongocrypt
24182412
- :who: mocsharp
24192413
:why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
24202414
:versions:
2421-
- 1.6.0
2415+
- 1.7.0
24222416
:when: 2022-11-16 23:38:54.863359236 Z
24232417
- - :approve
24242418
- SharpCompress

‎docs/api/rest/fhir.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
# DICOMWeb STOW-RS APIs
17+
# FHIR APIs
1818

1919
The `fhir/` endpoint implements the specifications defined in [section 3.1.0 RESTful API](http://hl7.org/implement/standards/fhir/http.html)
2020
defined by HL7 (Health Level 7 International) to enable triggering new workflows. The FHIR service supports multiple versions of the Fast Healthcare Interoperability Resources (FHIR) specifications published by Health Level 7 International (HL7).

‎docs/api/rest/toc.yml

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
- name: Configuration
1616
href: config.md
17+
- name: DICOMWeb STOW
18+
href: dicomweb-stow.md
19+
- name: FHIR
20+
href: fhir.md
1721
- name: Health
1822
href: health.md
1923
- name: Inference Request

‎docs/changelog.md

+8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@
1717

1818
# Changelog
1919

20+
## 0.3.8
21+
22+
[GitHub Milestone 0.3.8](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/14)
23+
24+
- Clears payloads that are created by the same instance of MIG at startup.
25+
- Fixes bad Mongodb configuration resulted in GUIDs not being (de)serialized correctly.
26+
27+
2028
## 0.3.7
2129

2230
[GitHub Milestone 0.3.7](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/13)

‎src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
30+
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
3131
<PrivateAssets>All</PrivateAssets>
3232
</PackageReference>
3333
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.12" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.13" />
3535
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.19" />
3636
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.13" />
3737
</ItemGroup>

‎src/Api/Storage/Payload.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ public enum PayloadState
4646
private readonly Stopwatch _lastReceived;
4747
private bool _disposedValue;
4848

49-
public Guid PayloadId { get; }
49+
public Guid PayloadId { get; private set; }
5050

5151
public uint Timeout { get; init; }
5252

5353
public string Key { get; init; }
5454

55+
public string? MachineName { get; init; }
56+
5557
public DateTime DateTimeCreated { get; private set; }
5658

5759
public int RetryCount { get; set; }
@@ -81,6 +83,7 @@ public Payload(string key, string correlationId, uint timeout)
8183
_lastReceived = new Stopwatch();
8284

8385
CorrelationId = correlationId;
86+
MachineName = Environment.MachineName;
8487
DateTimeCreated = DateTime.UtcNow;
8588
PayloadId = Guid.NewGuid();
8689
Key = key;

‎src/Api/Test/Monai.Deploy.InformaticsGateway.Api.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</PackageReference>
3636
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
3737
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
38-
<PackageReference Include="xRetry" Version="1.8.0" />
38+
<PackageReference Include="xRetry" Version="1.9.0" />
3939
<PackageReference Include="xunit" Version="2.4.2" />
4040
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)