Skip to content

Add extra logging for support case #4657

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

Closed
TravisNickels wants to merge 11 commits into from
Closed

Add extra logging for support case #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ccdf13
Add some extra logging for support
Dec 6, 2024
f0caaf1
Update the ASB version for logging
Dec 6, 2024
46b956f
Fix package version
Dec 6, 2024
75ea86d
Update nuget.config
boblangley Dec 6, 2024
9e1ec72
Update nuget.config
boblangley Dec 6, 2024
1302e0c
Update nuget config local package folder name to avoid gitignore
Dec 6, 2024
2bc6d3b
Add local ASB alpha packages
Dec 6, 2024
c9015dc
Update RabbitMQ and postgres action versions
Dec 6, 2024
d044bd8
Update src/ServiceControl/Recoverability/Retrying/Infrastructure/Retu…
Dec 9, 2024
3e2a72b
Remove command line package
Dec 9, 2024
ea68d56
Fix formatting
Dec 9, 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ jobs:
connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString
catalog: nservicebus
- name: Setup PostgreSQL
uses: Particular/[email protected].0
uses: Particular/[email protected].2
if: matrix.test-category == 'PostgreSQL'
with:
with:
connection-string-name: ServiceControl_TransportTests_PostgreSQL_ConnectionString
tag: ServiceControl
registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Setup RabbitMQ
uses: Particular/[email protected].0
uses: Particular/[email protected].1
if: matrix.test-category == 'RabbitMQ'
with:
connection-string-name: ServiceControl_TransportTests_RabbitMQ_ConnectionString
Expand Down
Binary file added local-packages/NServiceBus.Transport.AzureServiceBus.4.2.4-alpha.0.4.nupkg
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="particular packages" value="https://f.feedz.io/particular-software/packages/nuget/index.json" />
<add key="local packages" value="local-packages" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<PackageVersion Include="NServiceBus.RabbitMQ" Version="9.1.1" />
<PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.1" />
<PackageVersion Include="NServiceBus.Testing" Version="9.0.0" />
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.3" />
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.4-alpha.0.4" />
<PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.1" />
<PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.1" />
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.6" />
Expand Down
10 changes: 9 additions & 1 deletion src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,17 @@ public virtual async Task Run(string forwardingBatchId, Predicate<MessageContext
Log.DebugFormat($"Waiting for forwarder for batch {forwardingBatchId} to finish.");
}

await syncEvent.Task;
Log.Debug("Awaiting syncEvent.Task");
_ = await syncEvent.Task;
Log.Debug("syncEvent.Task completed");

Log.Debug("Disposing registration.");
registration?.Dispose();
Log.Debug("Registration disposed");

Log.Debug("Stopping message receiver");
await messageReceiver.StopReceive(cancellationToken);
Log.Debug("Message receiver stopped");

Log.Info($"Forwarder for batch {forwardingBatchId} finished forwarding all messages.");

Expand Down