Skip to content

Use TryAddSingleton instead of AddSingleton for extension #643

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 3 commits into from
Apr 11, 2025
Merged

Use TryAddSingleton instead of AddSingleton for extension #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e17770d
use TryAddSingleton instead of AddSingleton in extension, fix refresh…
amerjusupovic Apr 7, 2025
a1952b2
remove unused using
amerjusupovic Apr 7, 2025
9c315f9
add comment
amerjusupovic Apr 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
5 changes: 3 additions & 2 deletions ...crosoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using System;
using System.Collections.Generic;
using System.Security;
Expand Down Expand Up @@ -99,11 +100,11 @@ public static IServiceCollection AddAzureAppConfiguration(this IServiceCollectio
if (!_isProviderDisabled)
{
services.AddLogging();
services.AddSingleton<IConfigurationRefresherProvider, AzureAppConfigurationRefresherProvider>();
services.TryAddSingleton<IConfigurationRefresherProvider, AzureAppConfigurationRefresherProvider>();
}
else
{
services.AddSingleton<IConfigurationRefresherProvider, EmptyConfigurationRefresherProvider>();
services.TryAddSingleton<IConfigurationRefresherProvider, EmptyConfigurationRefresherProvider>();
}

return services;
Expand Down
35 changes: 31 additions & 4 deletions ....Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationRefresherProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,38 @@ internal class AzureAppConfigurationRefresherProvider : IConfigurationRefresherP
{
private static readonly PropertyInfo _propertyInfo = typeof(ChainedConfigurationProvider).GetProperty("Configuration", BindingFlags.Public | BindingFlags.Instance);

public IEnumerable<IConfigurationRefresher> Refreshers { get; }
private readonly IConfiguration _configuration;
private readonly ILoggerFactory _loggerFactory;
private IEnumerable<IConfigurationRefresher> _refreshers;
private bool _rediscoveredRefreshers = false;

public AzureAppConfigurationRefresherProvider(IConfiguration configuration, ILoggerFactory _loggerFactory)
public IEnumerable<IConfigurationRefresher> Refreshers
{
var configurationRoot = configuration as IConfigurationRoot;
get
{
// Ensure latest refreshers are discovered if the configuration has changed since the constructor was called
if (!_rediscoveredRefreshers)
{
_refreshers = DiscoverRefreshers();

_rediscoveredRefreshers = true;
}

return _refreshers;
}
}

public AzureAppConfigurationRefresherProvider(IConfiguration configuration, ILoggerFactory loggerFactory)
{
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
_loggerFactory = loggerFactory;

_refreshers = DiscoverRefreshers();
}

private IEnumerable<IConfigurationRefresher> DiscoverRefreshers()
{
var configurationRoot = _configuration as IConfigurationRoot;
var refreshers = new List<IConfigurationRefresher>();

FindRefreshers(configurationRoot, _loggerFactory, refreshers);
Expand All @@ -27,7 +54,7 @@ public AzureAppConfigurationRefresherProvider(IConfiguration configuration, ILog
throw new InvalidOperationException("Unable to access the Azure App Configuration provider. Please ensure that it has been configured correctly.");
}

Refreshers = refreshers;
return refreshers;
}

private void FindRefreshers(IConfigurationRoot configurationRoot, ILoggerFactory loggerFactory, List<IConfigurationRefresher> refreshers)
Expand Down