Skip to content

Fix the order of some log arguments #36

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

Merged
kevinchalet merged 1 commit into from
Aug 6, 2025
Merged

Fix the order of some log arguments #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/OpenNetty/OpenNettyGatewayOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public static OpenNettyGatewayOptions CreateDefaults(OpenNettyDevice device)
return ValueTask.FromResult(false);
}

logger.LogInformation(6016, arguments.Outcome.Exception, SR.GetResourceString(SR.ID6016), message, gateway);
logger.LogInformation(6016, arguments.Outcome.Exception, SR.GetResourceString(SR.ID6016), gateway, message);

return ValueTask.FromResult(arguments.Outcome.Exception switch
{
Expand Down Expand Up @@ -240,7 +240,7 @@ when message.Medium is OpenNettyMedium.Bus
throw new InvalidOperationException(SR.GetResourceString(SR.ID0074));
}

logger.LogInformation(6017, SR.GetResourceString(SR.ID6017), message, gateway, (uint) arguments.AttemptNumber + 1);
logger.LogInformation(6017, SR.GetResourceString(SR.ID6017), gateway, message, (uint) arguments.AttemptNumber + 1);

return ValueTask.CompletedTask;
}
Expand Down Expand Up @@ -292,7 +292,7 @@ when message.Medium is OpenNettyMedium.Bus
return ValueTask.FromResult(false);
}

logger.LogInformation(6020, exception, SR.GetResourceString(SR.ID6020), gateway, type);
logger.LogInformation(6020, exception, SR.GetResourceString(SR.ID6020), type, gateway);

// Always recreate new sessions on failed attempts, unless the operation was canceled by the worker.
return ValueTask.FromResult(!arguments.Context.CancellationToken.IsCancellationRequested);
Expand Down
2 changes: 1 addition & 1 deletion src/OpenNetty/OpenNettyResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
<value>An error occurred while sending a message to gateway {Gateway}: {Message}.</value>
</data>
<data name="ID6017" xml:space="preserve">
<value>A message will be retransmitted by gateway {Gateway}: {Message} (attempt number n°{Attempt}).</value>
<value>A message will be retransmitted by gateway {Gateway}: {Message} (retransmission number n°{Attempt}).</value>
</data>
<data name="ID6018" xml:space="preserve">
<value>An unhandled exception was thrown by a Reactive Extensions event handler.</value>
Expand Down
20 changes: 10 additions & 10 deletions src/OpenNetty/OpenNettyWorker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ await gateway.Options.SessionResiliencePipeline.ExecuteAsync(async context =>
using var source = CancellationTokenSource.CreateLinkedTokenSource(context.CancellationToken);
await using var session = await OpenNettySession.CreateAsync(gateway, type, source.Token);

_logger.LogDebug(6007, SR.GetResourceString(SR.ID6007), gateway, type, session);
_logger.LogDebug(6007, SR.GetResourceString(SR.ID6007), type, gateway, session);

try
{
await using (await session.SubscribeAsync(
async message =>
{
_logger.LogDebug(6009, SR.GetResourceString(SR.ID6009), message, gateway, session);
_logger.LogDebug(6009, SR.GetResourceString(SR.ID6009), gateway, session, message);

await writer.WriteAsync(new OpenNettyNotifications.MessageReceived
{
Expand Down Expand Up @@ -155,14 +155,14 @@ await gateway.Options.SessionResiliencePipeline.ExecuteAsync(async context =>
using var source = CancellationTokenSource.CreateLinkedTokenSource(context.CancellationToken);
await using var session = await OpenNettySession.CreateAsync(gateway, type, source.Token);

_logger.LogDebug(6007, SR.GetResourceString(SR.ID6007), gateway, type, session);
_logger.LogDebug(6007, SR.GetResourceString(SR.ID6007), type, gateway, session);

try
{
await using var subscription = await session.SubscribeAsync(
async message =>
{
_logger.LogDebug(6009, SR.GetResourceString(SR.ID6009), message, gateway, session);
_logger.LogDebug(6009, SR.GetResourceString(SR.ID6009), gateway, session, message);

await writer.WriteAsync(new OpenNettyNotifications.MessageReceived
{
Expand Down Expand Up @@ -231,7 +231,7 @@ async Task SendMessageAsync(

catch (OpenNettyException exception) when (exception.ErrorCode is OpenNettyErrorCode.GatewayBusy)
{
_logger.LogInformation(6011, SR.GetResourceString(SR.ID6011), message, gateway, session);
_logger.LogInformation(6011, SR.GetResourceString(SR.ID6011), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.GatewayBusy
{
Expand All @@ -246,7 +246,7 @@ async Task SendMessageAsync(

catch (OpenNettyException exception) when (exception.ErrorCode is OpenNettyErrorCode.InvalidAction)
{
_logger.LogInformation(6012, SR.GetResourceString(SR.ID6012), message, gateway, session);
_logger.LogInformation(6012, SR.GetResourceString(SR.ID6012), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.InvalidAction
{
Expand All @@ -261,7 +261,7 @@ async Task SendMessageAsync(

catch (OpenNettyException exception) when (exception.ErrorCode is OpenNettyErrorCode.NoActionReceived)
{
_logger.LogInformation(6013, SR.GetResourceString(SR.ID6013), message, gateway, session);
_logger.LogInformation(6013, SR.GetResourceString(SR.ID6013), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.NoActionReceived
{
Expand All @@ -276,7 +276,7 @@ async Task SendMessageAsync(

catch (OpenNettyException exception) when (exception.ErrorCode is OpenNettyErrorCode.NoAcknowledgementReceived)
{
_logger.LogInformation(6014, SR.GetResourceString(SR.ID6014), message, gateway, session);
_logger.LogInformation(6014, SR.GetResourceString(SR.ID6014), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.NoAcknowledgmentReceived
{
Expand All @@ -292,7 +292,7 @@ async Task SendMessageAsync(

catch (OpenNettyException exception) when (exception.ErrorCode is OpenNettyErrorCode.InvalidFrame)
{
_logger.LogInformation(6015, SR.GetResourceString(SR.ID6015), message, gateway, session);
_logger.LogInformation(6015, SR.GetResourceString(SR.ID6015), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.InvalidFrame
{
Expand All @@ -305,7 +305,7 @@ async Task SendMessageAsync(
return;
}

_logger.LogDebug(6010, SR.GetResourceString(SR.ID6010), message, gateway, session);
_logger.LogDebug(6010, SR.GetResourceString(SR.ID6010), gateway, session, message);

await writer.WriteAsync(cancellationToken: cancellationToken, item: new OpenNettyNotifications.MessageSent
{
Expand Down
Loading