Skip to content

Refactor MailKitClientFactory to remove semaphore and recreate a client for each connection #2849

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
merged 1 commit into from
Mar 21, 2025
Merged

Refactor MailKitClientFactory to remove semaphore and recreate a client for each connection #2849

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
27 changes: 8 additions & 19 deletions ...extensibility/snippets/MailDevResourceAndComponent/MailKit.Client/MailKitClientFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ namespace MailKit.Client;
/// </param>
public sealed class MailKitClientFactory(MailKitClientSettings settings) : IDisposable
{
private readonly SemaphoreSlim _semaphore = new(1, 1);

private SmtpClient? _client;

/// <summary>
/// Gets an <see cref="ISmtpClient"/> instance in the connected state
Expand All @@ -29,29 +26,21 @@ public sealed class MailKitClientFactory(MailKitClientSettings settings) : IDisp
public async Task<ISmtpClient> GetSmtpClientAsync(
CancellationToken cancellationToken = default)
{
await _semaphore.WaitAsync(cancellationToken);

var client = new SmtpClient();
try
{
if (_client is null)
if (settings.Endpoint is not null)
{
_client = new SmtpClient();

await _client.ConnectAsync(settings.Endpoint, cancellationToken)
await client.ConnectAsync(settings.Endpoint, cancellationToken)
.ConfigureAwait(false);
}
return client;
}
finally
catch
{
_semaphore.Release();
await client.DisconnectAsync(true, cancellationToken)
client.Dispose();
throw;
}

return _client;
}

public void Dispose()
{
_client?.Dispose();
_semaphore.Dispose();
}
}
Loading