Skip to content
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

fix(#435): use TryAddSingleton when registering IStorageInitializer to avoid overwriting user configured initialisers #1490

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(#435): use TryAddSingleton when registering IStorageInitializer to avoid overwriting user configured initialisers #1490

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
3 changes: 2 additions & 1 deletion src/DotNetCore.CAP.InMemoryStorage/CAP.InMemoryCapOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using DotNetCore.CAP.InMemoryStorage;
using DotNetCore.CAP.Persistence;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;

// ReSharper disable once CheckNamespace
namespace DotNetCore.CAP;
Expand All @@ -16,6 +17,6 @@ public void AddServices(IServiceCollection services)

services.AddTransient<ICapTransaction, InMemoryCapTransaction>();
services.AddSingleton<IDataStorage, InMemoryStorage.InMemoryStorage>();
services.AddSingleton<IStorageInitializer, InMemoryStorageInitializer>();
services.TryAddSingleton<IStorageInitializer, InMemoryStorageInitializer>();
}
}
2 changes: 1 addition & 1 deletion src/DotNetCore.CAP.MongoDB/CAP.MongoDBCapOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void AddServices(IServiceCollection services)
services.AddSingleton(new CapStorageMarkerService("MongoDB"));

services.AddSingleton<IDataStorage, MongoDBDataStorage>();
services.AddSingleton<IStorageInitializer, MongoDBStorageInitializer>();
services.TryAddSingleton<IStorageInitializer, MongoDBStorageInitializer>();

services.Configure(_configure);

Expand Down
3 changes: 2 additions & 1 deletion src/DotNetCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using DotNetCore.CAP.Persistence;
using DotNetCore.CAP.PostgreSql;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;

// ReSharper disable once CheckNamespace
Expand All @@ -26,6 +27,6 @@ public void AddServices(IServiceCollection services)
services.AddSingleton<IConfigureOptions<PostgreSqlOptions>, ConfigurePostgreSqlOptions>();

services.AddSingleton<IDataStorage, PostgreSqlDataStorage>();
services.AddSingleton<IStorageInitializer, PostgreSqlStorageInitializer>();
services.TryAddSingleton<IStorageInitializer, PostgreSqlStorageInitializer>();
}
}
2 changes: 1 addition & 1 deletion src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void AddServices(IServiceCollection services)

services.AddSingleton<DiagnosticProcessorObserver>();
services.AddSingleton<IDataStorage, SqlServerDataStorage>();
services.AddSingleton<IStorageInitializer, SqlServerStorageInitializer>();
services.TryAddSingleton<IStorageInitializer, SqlServerStorageInitializer>();
services.TryAddEnumerable(ServiceDescriptor.Singleton<IProcessingServer, DiagnosticRegister>());

services.Configure(_configure);
Expand Down