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

Jump to bottom

return error if journal fails instead of waiting forever #176

Merged
merged 5 commits into from
Sep 20, 2024
Merged

return error if journal fails instead of waiting forever #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e572c0e
throw if journal fails instead of waiting forever
volllly Sep 19, 2024
6fb76da
fix build
volllly Sep 19, 2024
b6d2510
update deprecated pipeline agents
volllly Sep 20, 2024
42d1fe8
update deprecated pipeline agents
volllly Sep 20, 2024
35b8cf2
Merge branch 'fix-journal-error-handling' of github.com:fiskaltrust/m…
volllly Sep 20, 2024
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
2 changes: 1 addition & 1 deletion azure-pipelines/templates/stages/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ stages:
scriptFolder: 'linux'

osx-x64:
vmImage: macos-11
vmImage: macos-latest
target: osx-x64
scriptFolder: 'macos'

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/templates/stages/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ stages:

- job: TestMacOS
pool:
vmImage: macos-11
vmImage: macos-latest

steps:
- template: ../restore.yml
Expand Down
4 changes: 3 additions & 1 deletion src/fiskaltrust.Launcher/Extensions/WebApplicationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ public static WebApplication AddQueueEndpoints(this WebApplication app, IPOS pos
app.MapMultiplePrefixed(_prefixesV1, "Echo", EndpointRouteBuilderExtensions.MapPost, async (ifPOS.v1.EchoRequest req) => await pos.EchoAsync(req));
app.MapMultiplePrefixed(_prefixesV0, "Echo", EndpointRouteBuilderExtensions.MapPost, async ([FromBody] string message) => (await pos.EchoAsync(new ifPOS.v1.EchoRequest { Message = message })).Message);
app.MapMultiplePrefixed(_prefixes, "Sign", EndpointRouteBuilderExtensions.MapPost, async (ReceiptRequest req) => await pos.SignAsync(req));
app.MapMultiplePrefixed(_prefixes, "Journal", EndpointRouteBuilderExtensions.MapPost, ([FromQuery] long type, [FromQuery] long? from, [FromQuery] long? to) =>
app.MapMultiplePrefixed(_prefixes, "Journal", EndpointRouteBuilderExtensions.MapPost, async ([FromQuery] long type, [FromQuery] long? from, [FromQuery] long? to) =>
{
var pipe = new Pipe();
var journal = pos.JournalAsync(new JournalRequest { ftJournalType = type, From = from ?? 0, To = to ?? 0 });
// Throws if something failed in the request. Does not pop the first element
await journal.FirstAsync();
var _ = Task.Run(async () =>
{
await journal.ForEachAwaitAsync(async b => await pipe.Writer.WriteAsync(new ReadOnlyMemory<byte>(b.Chunk.ToArray())));
Expand Down
Loading