Skip to content

Fix task tracking #764

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
mtmk merged 2 commits into from
Mar 7, 2025
Merged

Fix task tracking #764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf6ec29
Fix task tracking
mtmk Mar 7, 2025
5591170
Merge branch 'main' into fix-task-tracking
mtmk Mar 7, 2025
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
10 changes: 6 additions & 4 deletions src/NATS.Client.Core/NatsConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public partial class NatsConnection : INatsConnection
private TimeSpan _backoff = TimeSpan.Zero;
private string _lastAuthError = string.Empty;
private bool _stopRetries;
private Task? _publishEventsTask;
private Task? _reconnectLoopTask;

public NatsConnection()
: this(NatsOpts.Default)
Expand Down Expand Up @@ -97,7 +99,7 @@ public NatsConnection(NatsOpts opts)
SingleWriter = false,
SingleReader = true,
});
_ = Task.Run(PublishEventsAsync, _disposedCancellationTokenSource.Token);
_publishEventsTask = Task.Run(PublishEventsAsync, _disposedCancellationTokenSource.Token);
}

// events
Expand Down Expand Up @@ -410,7 +412,7 @@ private async ValueTask InitialConnectAsync()
_pingTimerCancellationTokenSource = new CancellationTokenSource();
StartPingTimer(_pingTimerCancellationTokenSource.Token);
_waitForOpenConnection.TrySetResult();
_ = Task.Run(ReconnectLoop);
_reconnectLoopTask = Task.Run(ReconnectLoop);
_eventChannel.Writer.TryWrite((NatsEvent.ConnectionOpened, new NatsEventArgs(url?.ToString() ?? string.Empty)));
}
}
Expand Down Expand Up @@ -709,7 +711,7 @@ private async void ReconnectLoop()
_pingTimerCancellationTokenSource = new CancellationTokenSource();
StartPingTimer(_pingTimerCancellationTokenSource.Token);
_waitForOpenConnection.TrySetResult();
_ = Task.Run(ReconnectLoop);
_reconnectLoopTask = Task.Run(ReconnectLoop);
_eventChannel.Writer.TryWrite((NatsEvent.ConnectionOpened, new NatsEventArgs(url.ToString())));
}
}
Expand Down Expand Up @@ -796,7 +798,7 @@ private async Task PublishEventsAsync()
{
_logger.LogError(NatsLogEvents.Connection, ex, "Error occured when publishing events");
if (!_disposedCancellationTokenSource.IsCancellationRequested)
_ = Task.Run(PublishEventsAsync, _disposedCancellationTokenSource.Token);
_publishEventsTask = Task.Run(PublishEventsAsync, _disposedCancellationTokenSource.Token);
}
}

Expand Down