New: Config file setting to disable log database

Closes #6743
This commit is contained in:
Jared 2024-05-05 01:54:42 +00:00 committed by GitHub
parent 23c741fd00
commit 92eab4b2e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 67 additions and 10 deletions

View File

@ -30,6 +30,7 @@ namespace NzbDrone.Common.Test
.AddNzbDroneLogger() .AddNzbDroneLogger()
.AutoAddServices(Bootstrap.ASSEMBLIES) .AutoAddServices(Bootstrap.ASSEMBLIES)
.AddDummyDatabase() .AddDummyDatabase()
.AddDummyLogDatabase()
.AddStartupContext(new StartupContext("first", "second")); .AddStartupContext(new StartupContext("first", "second"));
container.RegisterInstance(new Mock<IHostLifetime>().Object); container.RegisterInstance(new Mock<IHostLifetime>().Object);

View File

@ -11,4 +11,5 @@ public class LogOptions
public string SyslogServer { get; set; } public string SyslogServer { get; set; }
public int? SyslogPort { get; set; } public int? SyslogPort { get; set; }
public string SyslogLevel { get; set; } public string SyslogLevel { get; set; }
public bool? DbEnabled { get; set; }
} }

View File

@ -54,6 +54,7 @@ namespace NzbDrone.Core.Configuration
string SyslogServer { get; } string SyslogServer { get; }
int SyslogPort { get; } int SyslogPort { get; }
string SyslogLevel { get; } string SyslogLevel { get; }
bool LogDbEnabled { get; }
string Theme { get; } string Theme { get; }
string PostgresHost { get; } string PostgresHost { get; }
int PostgresPort { get; } int PostgresPort { get; }
@ -230,7 +231,7 @@ namespace NzbDrone.Core.Configuration
public string PostgresMainDb => _postgresOptions?.MainDb ?? GetValue("PostgresMainDb", "sonarr-main", persist: false); public string PostgresMainDb => _postgresOptions?.MainDb ?? GetValue("PostgresMainDb", "sonarr-main", persist: false);
public string PostgresLogDb => _postgresOptions?.LogDb ?? GetValue("PostgresLogDb", "sonarr-log", 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 int PostgresPort => (_postgresOptions?.Port ?? 0) != 0 ? _postgresOptions.Port : GetValueInt("PostgresPort", 5432, persist: false);
public bool LogDbEnabled => _logOptions.DbEnabled ?? GetValueBoolean("LogDbEnabled", true, persist: false);
public bool LogSql => _logOptions.Sql ?? GetValueBoolean("LogSql", false, persist: false); public bool LogSql => _logOptions.Sql ?? GetValueBoolean("LogSql", false, persist: false);
public int LogRotate => _logOptions.Rotate ?? GetValueInt("LogRotate", 50, persist: false); public int LogRotate => _logOptions.Rotate ?? GetValueInt("LogRotate", 50, persist: false);
public bool FilterSentryEvents => _logOptions.FilterSentryEvents ?? GetValueBoolean("FilterSentryEvents", true, persist: false); public bool FilterSentryEvents => _logOptions.FilterSentryEvents ?? GetValueBoolean("FilterSentryEvents", true, persist: false);

View File

@ -8,6 +8,12 @@ namespace NzbDrone.Core.Datastore.Extensions
public static IContainer AddDatabase(this IContainer container) public static IContainer AddDatabase(this IContainer container)
{ {
container.RegisterDelegate<IDbFactory, IMainDatabase>(f => new MainDatabase(f.Create()), Reuse.Singleton); container.RegisterDelegate<IDbFactory, IMainDatabase>(f => new MainDatabase(f.Create()), Reuse.Singleton);
return container;
}
public static IContainer AddLogDatabase(this IContainer container)
{
container.RegisterDelegate<IDbFactory, ILogDatabase>(f => new LogDatabase(f.Create(MigrationType.Log)), Reuse.Singleton); container.RegisterDelegate<IDbFactory, ILogDatabase>(f => new LogDatabase(f.Create(MigrationType.Log)), Reuse.Singleton);
return container; return container;
@ -16,6 +22,12 @@ namespace NzbDrone.Core.Datastore.Extensions
public static IContainer AddDummyDatabase(this IContainer container) public static IContainer AddDummyDatabase(this IContainer container)
{ {
container.RegisterInstance<IMainDatabase>(new MainDatabase(null)); container.RegisterInstance<IMainDatabase>(new MainDatabase(null));
return container;
}
public static IContainer AddDummyLogDatabase(this IContainer container)
{
container.RegisterInstance<ILogDatabase>(new LogDatabase(null)); container.RegisterInstance<ILogDatabase>(new LogDatabase(null));
return container; return container;

View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using NLog; using NLog;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Lifecycle; using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Update.History.Events; using NzbDrone.Core.Update.History.Events;
@ -18,13 +19,15 @@ namespace NzbDrone.Core.Update.History
{ {
private readonly IUpdateHistoryRepository _repository; private readonly IUpdateHistoryRepository _repository;
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly IConfigFileProvider _configFileProvider;
private readonly Logger _logger; private readonly Logger _logger;
private Version _prevVersion; private Version _prevVersion;
public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, Logger logger) public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, IConfigFileProvider configFileProvider, Logger logger)
{ {
_repository = repository; _repository = repository;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_configFileProvider = configFileProvider;
_logger = logger; _logger = logger;
} }
@ -58,7 +61,7 @@ namespace NzbDrone.Core.Update.History
public void Handle(ApplicationStartedEvent message) public void Handle(ApplicationStartedEvent message)
{ {
if (BuildInfo.Version.Major == 10) if (BuildInfo.Version.Major == 10 || !_configFileProvider.LogDbEnabled)
{ {
// Don't save dev versions, they change constantly // Don't save dev versions, they change constantly
return; return;

View File

@ -29,7 +29,7 @@ namespace NzbDrone.Core.Update
{ {
var branch = _configFileProvider.Branch; var branch = _configFileProvider.Branch;
var version = BuildInfo.Version; var version = BuildInfo.Version;
var prevVersion = _updateHistoryService.PreviouslyInstalled(); var prevVersion = _configFileProvider.LogDbEnabled ? _updateHistoryService.PreviouslyInstalled() : null;
return _updatePackageProvider.GetRecentUpdates(branch, version, prevVersion); return _updatePackageProvider.GetRecentUpdates(branch, version, prevVersion);
} }
} }

View File

@ -95,6 +95,15 @@ namespace NzbDrone.Host
.AddStartupContext(startupContext) .AddStartupContext(startupContext)
.Resolve<UtilityModeRouter>() .Resolve<UtilityModeRouter>()
.Route(appMode); .Route(appMode);
if (config.GetValue(nameof(ConfigFileProvider.LogDbEnabled), true))
{
c.AddLogDatabase();
}
else
{
c.AddDummyLogDatabase();
}
}) })
.ConfigureServices(services => .ConfigureServices(services =>
{ {
@ -131,6 +140,7 @@ namespace NzbDrone.Host
var enableSsl = config.GetValue<bool?>($"Sonarr:Server:{nameof(ServerOptions.EnableSsl)}") ?? config.GetValue(nameof(ConfigFileProvider.EnableSsl), false); var enableSsl = config.GetValue<bool?>($"Sonarr:Server:{nameof(ServerOptions.EnableSsl)}") ?? config.GetValue(nameof(ConfigFileProvider.EnableSsl), false);
var sslCertPath = config.GetValue<string>($"Sonarr:Server:{nameof(ServerOptions.SslCertPath)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPath)); var sslCertPath = config.GetValue<string>($"Sonarr:Server:{nameof(ServerOptions.SslCertPath)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPath));
var sslCertPassword = config.GetValue<string>($"Sonarr:Server:{nameof(ServerOptions.SslCertPassword)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPassword)); var sslCertPassword = config.GetValue<string>($"Sonarr:Server:{nameof(ServerOptions.SslCertPassword)}") ?? config.GetValue<string>(nameof(ConfigFileProvider.SslCertPassword));
var logDbEnabled = config.GetValue<bool?>($"Sonarr:Log:{nameof(LogOptions.DbEnabled)}") ?? config.GetValue(nameof(ConfigFileProvider.LogDbEnabled), true);
var urls = new List<string> { BuildUrl("http", bindAddress, port) }; var urls = new List<string> { BuildUrl("http", bindAddress, port) };
@ -153,6 +163,15 @@ namespace NzbDrone.Host
.AddDatabase() .AddDatabase()
.AddStartupContext(context); .AddStartupContext(context);
if (logDbEnabled)
{
c.AddLogDatabase();
}
else
{
c.AddDummyLogDatabase();
}
SchemaBuilder.Initialize(c); SchemaBuilder.Initialize(c);
}) })
.ConfigureServices(services => .ConfigureServices(services =>

View File

@ -220,9 +220,12 @@ namespace NzbDrone.Host
// instantiate the databases to initialize/migrate them // instantiate the databases to initialize/migrate them
_ = mainDatabaseFactory.Value; _ = mainDatabaseFactory.Value;
_ = logDatabaseFactory.Value;
dbTarget.Register(); if (configFileProvider.LogDbEnabled)
{
_ = logDatabaseFactory.Value;
dbTarget.Register();
}
if (OsInfo.IsNotWindows) if (OsInfo.IsNotWindows)
{ {

View File

@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Instrumentation;
using Sonarr.Http; using Sonarr.Http;
using Sonarr.Http.Extensions; using Sonarr.Http.Extensions;
@ -10,16 +11,23 @@ namespace Sonarr.Api.V3.Logs
public class LogController : Controller public class LogController : Controller
{ {
private readonly ILogService _logService; private readonly ILogService _logService;
private readonly IConfigFileProvider _configFileProvider;
public LogController(ILogService logService) public LogController(ILogService logService, IConfigFileProvider configFileProvider)
{ {
_logService = logService; _logService = logService;
_configFileProvider = configFileProvider;
} }
[HttpGet] [HttpGet]
[Produces("application/json")] [Produces("application/json")]
public PagingResource<LogResource> GetLogs([FromQuery] PagingRequestResource paging, string level) public PagingResource<LogResource> GetLogs([FromQuery] PagingRequestResource paging, string level)
{ {
if (!_configFileProvider.LogDbEnabled)
{
return new PagingResource<LogResource>();
}
var pagingResource = new PagingResource<LogResource>(paging); var pagingResource = new PagingResource<LogResource>(paging);
var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>(); var pageSpec = pagingResource.MapToPagingSpec<LogResource, Log>();

View File

@ -2,6 +2,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Update; using NzbDrone.Core.Update;
using NzbDrone.Core.Update.History; using NzbDrone.Core.Update.History;
using Sonarr.Http; using Sonarr.Http;
@ -13,11 +14,13 @@ namespace Sonarr.Api.V3.Update
{ {
private readonly IRecentUpdateProvider _recentUpdateProvider; private readonly IRecentUpdateProvider _recentUpdateProvider;
private readonly IUpdateHistoryService _updateHistoryService; private readonly IUpdateHistoryService _updateHistoryService;
private readonly IConfigFileProvider _configFileProvider;
public UpdateController(IRecentUpdateProvider recentUpdateProvider, IUpdateHistoryService updateHistoryService) public UpdateController(IRecentUpdateProvider recentUpdateProvider, IUpdateHistoryService updateHistoryService, IConfigFileProvider configFileProvider)
{ {
_recentUpdateProvider = recentUpdateProvider; _recentUpdateProvider = recentUpdateProvider;
_updateHistoryService = updateHistoryService; _updateHistoryService = updateHistoryService;
_configFileProvider = configFileProvider;
} }
[HttpGet] [HttpGet]
@ -45,7 +48,13 @@ namespace Sonarr.Api.V3.Update
installed.Installed = true; installed.Installed = true;
} }
var installDates = _updateHistoryService.InstalledSince(resources.Last().ReleaseDate) if (!_configFileProvider.LogDbEnabled)
{
return resources;
}
var updateHistory = _updateHistoryService.InstalledSince(resources.Last().ReleaseDate);
var installDates = updateHistory
.DistinctBy(v => v.Version) .DistinctBy(v => v.Version)
.ToDictionary(v => v.Version); .ToDictionary(v => v.Version);

View File

@ -21,7 +21,7 @@ namespace Sonarr.Http
public string SortKey { get; set; } public string SortKey { get; set; }
public SortDirection SortDirection { get; set; } public SortDirection SortDirection { get; set; }
public int TotalRecords { get; set; } public int TotalRecords { get; set; }
public List<TResource> Records { get; set; } public List<TResource> Records { get; set; } = new ();
public PagingResource() public PagingResource()
{ {