tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-03-05 13:21:25 -05:00
Code Issues Projects Releases Wiki Activity

Make postgres integration tests actually use postgres

Browse Source
This commit is contained in:
ta264
2022-04-05 21:42:28 +01:00
committed by Qstick
parent a95f8fa873
commit d58f0806f6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Datastore/PostgresOptions.cs
View File

@@ -14,11 +14,11 @@ namespace NzbDrone.Core.Datastore
public static PostgresOptions GetOptions()
{
var config = new ConfigurationBuilder()
.AddEnvironmentVariables("Radarr__")
.AddEnvironmentVariables()
.Build();
var postgresOptions = new PostgresOptions();
config.GetSection("Postgres").Bind(postgresOptions);
config.GetSection("Radarr:Postgres").Bind(postgresOptions);
return postgresOptions;
}

7
src/NzbDrone.Host/Bootstrap.cs
View File

@@ -8,8 +8,6 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using DryIoc;
using DryIoc.Microsoft.DependencyInjection;
using FluentMigrator.Runner.Processors.Postgres;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
@@ -17,7 +15,6 @@ using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Hosting.WindowsServices;
using NLog;
using NzbDrone.Common.Composition.Extensions;
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Exceptions;
using NzbDrone.Common.Extensions;
@@ -135,7 +132,7 @@ namespace Radarr.Host
})
.ConfigureServices(services =>
{
services.Configure<PostgresOptions>(config.GetSection("Postgres"));
services.Configure<PostgresOptions>(config.GetSection("Radarr:Postgres"));
})
.ConfigureWebHost(builder =>
{
@@ -207,7 +204,7 @@ namespace Radarr.Host
return new ConfigurationBuilder()
.AddXmlFile(appFolder.GetConfigPath(), optional: true, reloadOnChange: false)
.AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
.AddEnvironmentVariables("Radarr__")
.AddEnvironmentVariables()
.Build();
}