diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs index aa1e44fd4..ce29a1578 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs +++ b/services/Archival/FilterLists.Archival.Infrastructure/Persistence/ConfigurationExtensions.cs @@ -11,16 +11,18 @@ internal static class ConfigurationExtensions public static void AddPersistence(this IServiceCollection services, IConfiguration configuration) { services.Configure(configuration.GetSection(GitOptions.Key)); - services.AddTransient(_ => - { - var gitOptions = configuration.GetSection(GitOptions.Key).Get(); - if (!Repository.IsValid(gitOptions.RepositoryPath)) + services.AddTransient( + _ => { - Repository.Init(gitOptions.RepositoryPath); - } + var gitOptions = configuration.GetSection(GitOptions.Key) + .Get(); + if (!Repository.IsValid(gitOptions?.RepositoryPath)) + { + Repository.Init(gitOptions?.RepositoryPath); + } - return new Repository(gitOptions.RepositoryPath); - }); + return new Repository(gitOptions?.RepositoryPath); + }); services.AddTransient(); } } diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs index a6231842f..c62854785 100644 --- a/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs +++ b/services/Archival/FilterLists.Archival.Infrastructure/Scheduling/ConfigurationExtensions.cs @@ -11,8 +11,11 @@ internal static class ConfigurationExtensions public static void AddScheduling(this IServiceCollection services, IConfiguration configuration) { - _redis = ConnectionMultiplexer.Connect(configuration.GetConnectionString("SchedulingConnection")); - services.AddHangfire((_, globalConfiguration) => globalConfiguration.UseRedisStorage(_redis).UseMediatR()); + _redis = ConnectionMultiplexer.Connect( + configuration.GetConnectionString("SchedulingConnection") ?? string.Empty); + services.AddHangfire( + (_, globalConfiguration) => globalConfiguration.UseRedisStorage(_redis) + .UseMediatR()); services.AddHangfireServer(o => o.WorkerCount = Environment.ProcessorCount); } } diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs b/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs index e9ab2d407..001cc4859 100644 --- a/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/ConfigurationExtensions.cs @@ -12,15 +12,17 @@ public static void AddDirectoryApiClient(this IServiceCollection services, IConf { // TODO: use SystemTextJsonContentSerializer() once less feature-limited services.AddRefitClient() - .ConfigureHttpClient(c => - { - var host = configuration.GetSection(ApiOptions.Key).Get().DirectoryHost; - c.BaseAddress = new UriBuilder("http", host).Uri; - }) - .AddTransientHttpErrorPolicy(b => - b.WaitAndRetryAsync(new[] + .ConfigureHttpClient( + c => { - TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10) - })); + var host = configuration.GetSection(ApiOptions.Key) + .Get() + ?.DirectoryHost; + c.BaseAddress = new UriBuilder("http", host).Uri; + }) + .AddTransientHttpErrorPolicy( + b => + b.WaitAndRetryAsync( + new[] { TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10) })); } } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/Context/CommandDbContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/Context/CommandDbContext.cs index b83fb333d..774f6afd6 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/Context/CommandDbContext.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Commands/Context/CommandDbContext.cs @@ -16,7 +16,9 @@ internal class CommandDbContext : DbContext, ICommandContext { static CommandDbContext() { +#pragma warning disable CS0618 NpgsqlConnection.GlobalTypeMapper.MapEnum(); +#pragma warning restore CS0618 } public CommandDbContext(DbContextOptions options) : base(options) { } diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs index 3fcefb0c7..82be509ea 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs @@ -9,7 +9,9 @@ public class QueryDbContext : DbContext { static QueryDbContext() { +#pragma warning disable CS0618 NpgsqlConnection.GlobalTypeMapper.MapEnum(); +#pragma warning restore CS0618 } public QueryDbContext(DbContextOptions options) : base(options) { } diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs index 8f24af134..12c9cd2f1 100644 --- a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs +++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs @@ -23,7 +23,7 @@ public static void AddSharedKernelLogging(this IServiceCollection services, ICon { StorageFolder = configuration.GetSection(ApplicationInsightsOptions.Key) .Get() - .ServerTelemetryChannelStoragePath + ?.ServerTelemetryChannelStoragePath }; services.AddSingleton(typeof(ITelemetryChannel), serverTelemetryChannel); TelemetryDebugWriter.IsTracingDisabled = true;