Backup_Repos/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2025-12-06 08:28:37 +01:00
Code Issues Projects Releases Wiki Activity

New: Postgres Connection String option

Browse source
This commit is contained in:
solidDoWant 2025-11-26 20:38:26 -06:00 committed by GitHub
parent ae18ad61bd
commit d4f14246f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 77 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Core.Test/Framework/DbTest.cs
View file

@ -9,6 +9,7 @@
using Npgsql;
using NUnit.Framework;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Options;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Datastore.Migration.Framework;
@ -179,6 +180,7 @@ protected void SetupContainer()
// Set up remaining container services
Mocker.SetConstant(Options.Create(postgresOptions));
Mocker.GetMock<IOptions<LogOptions>>().Setup(v => v.Value).Returns(new LogOptions());
Mocker.SetConstant<IConfigFileProvider>(Mocker.Resolve<ConfigFileProvider>());
Mocker.SetConstant<IConnectionStringFactory>(Mocker.Resolve<ConnectionStringFactory>());
Mocker.SetConstant<IMigrationController>(Mocker.Resolve<MigrationController>());

4
src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
View file

@ -66,6 +66,8 @@ public interface IConfigFileProvider : IHandleAsync<ApplicationStartedEvent>,
string PostgresPassword { get; }
string PostgresMainDb { get; }
string PostgresLogDb { get; }
string PostgresMainDbConnectionString { get; }
string PostgresLogDbConnectionString { get; }
bool TrustCgnatIpAddresses { get; }
}
@ -252,6 +254,8 @@ public AuthenticationType AuthenticationMethod
public string PostgresMainDb => _postgresOptions?.MainDb ?? GetValue("PostgresMainDb", "sonarr-main", persist: false);
public string PostgresLogDb => _postgresOptions?.LogDb ?? GetValue("PostgresLogDb", "sonarr-log", persist: false);
public int PostgresPort => (_postgresOptions?.Port ?? 0) != 0 ? _postgresOptions.Port : GetValueInt("PostgresPort", 5432, persist: false);
public string PostgresMainDbConnectionString => _postgresOptions?.MainDbConnectionString ?? GetValue("PostgresMainDbConnectionString", string.Empty, persist: false);
public string PostgresLogDbConnectionString => _postgresOptions?.LogDbConnectionString ?? GetValue("PostgresLogDbConnectionString", string.Empty, persist: false);
public bool LogDbEnabled => _logOptions.DbEnabled ?? GetValueBoolean("LogDbEnabled", true, persist: false);
public bool LogSql => _logOptions.Sql ?? GetValueBoolean("LogSql", false, persist: false);
public int LogRotate => _logOptions.Rotate ?? GetValueInt("LogRotate", 50, persist: false);

73
src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs
View file

@ -2,6 +2,7 @@
using System.Data.SQLite;
using Npgsql;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Exceptions;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
@ -22,11 +23,25 @@ public ConnectionStringFactory(IAppFolderInfo appFolderInfo, IConfigFileProvider
{
_configFileProvider = configFileProvider;
MainDbConnection = _configFileProvider.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileProvider.PostgresMainDb) :
GetConnectionString(appFolderInfo.GetDatabase());
var connectionStringType = GetConnectionStringType();
LogDbConnection = _configFileProvider.PostgresHost.IsNotNullOrWhiteSpace() ? GetPostgresConnectionString(_configFileProvider.PostgresLogDb) :
GetConnectionString(appFolderInfo.GetLogDatabase());
switch (connectionStringType)
{
case ConnectionStringType.PostgreSqlVars:
MainDbConnection = GetPostgresConnectionString(_configFileProvider.PostgresMainDb);
LogDbConnection = GetPostgresConnectionString(_configFileProvider.PostgresLogDb);
break;
case ConnectionStringType.PostgreSqlConnectionString:
MainDbConnection = GetPostgresConnectionInfoFromConnectionString(_configFileProvider.PostgresMainDbConnectionString);
LogDbConnection = GetPostgresConnectionInfoFromConnectionString(_configFileProvider.PostgresLogDbConnectionString);
break;
case ConnectionStringType.Sqlite:
MainDbConnection = GetConnectionString(appFolderInfo.GetDatabase());
LogDbConnection = GetConnectionString(appFolderInfo.GetLogDatabase());
break;
default:
throw new SonarrStartupException("Unable to determine database connection string for type {0}.", connectionStringType.ToString());
}
}
public DatabaseConnectionInfo MainDbConnection { get; private set; }
@ -74,5 +89,55 @@ private DatabaseConnectionInfo GetPostgresConnectionString(string dbName)
return new DatabaseConnectionInfo(DatabaseType.PostgreSQL, connectionBuilder.ConnectionString);
}
private DatabaseConnectionInfo GetPostgresConnectionInfoFromConnectionString(string connectionString)
{
var connectionBuilder = new NpgsqlConnectionStringBuilder(connectionString)
{
Enlist = false
};
return new DatabaseConnectionInfo(DatabaseType.PostgreSQL, connectionBuilder.ConnectionString);
}
private ConnectionStringType GetConnectionStringType()
{
var isMainDBConnectionStringSet = !_configFileProvider.PostgresMainDbConnectionString.IsNullOrWhiteSpace();
var isLogDBConnectionStringSet = !_configFileProvider.PostgresLogDbConnectionString.IsNullOrWhiteSpace();
var isHostSet = !_configFileProvider.PostgresHost.IsNullOrWhiteSpace();
if (!isHostSet && !isMainDBConnectionStringSet && !isLogDBConnectionStringSet)
{
// No Postgres settings are set, so nothing to validate
return ConnectionStringType.Sqlite;
}
if (_configFileProvider.LogDbEnabled)
{
if (!isMainDBConnectionStringSet && isLogDBConnectionStringSet)
{
throw new SonarrStartupException("Postgres MainDbConnectionString is set but LogDbConnectionString is not. Both must be set or neither.");
}
if (isLogDBConnectionStringSet && !isMainDBConnectionStringSet)
{
throw new SonarrStartupException("Postgres LogDbConnectionString is set but MainDbConnectionString is not. Both must be set or neither.");
}
}
if (isMainDBConnectionStringSet && _configFileProvider.PostgresHost.IsNotNullOrWhiteSpace())
{
throw new SonarrStartupException($"Either both Postgres connection strings must be set, or the other Postgres settings must be set, but not both.");
}
return isMainDBConnectionStringSet ? ConnectionStringType.PostgreSqlConnectionString : ConnectionStringType.PostgreSqlVars;
}
private enum ConnectionStringType
{
Sqlite,
PostgreSqlVars,
PostgreSqlConnectionString
}
}
}

2
src/NzbDrone.Core/Datastore/PostgresOptions.cs
View file

@ -10,6 +10,8 @@ public class PostgresOptions
public string Password { get; set; }
public string MainDb { get; set; }
public string LogDb { get; set; }
public string MainDbConnectionString { get; set; }
public string LogDbConnectionString { get; set; }
public static PostgresOptions GetOptions()
{