Merge 7f0eb0f4f6 into c81ae65461

src/NzbDrone.Common.Test/ServiceFactoryFixture.cs

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

src/NzbDrone.Common/Options/LogOptions.cs

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

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

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

src/NzbDrone.Core/Datastore/Extensions/CompositionExtensions.cs

@@ -8,6 +8,12 @@ namespace NzbDrone.Core.Datastore.Extensions
         public static IContainer AddDatabase(this IContainer container)
         {
             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);
 
             return container;
@@ -16,6 +22,12 @@ namespace NzbDrone.Core.Datastore.Extensions
         public static IContainer AddDummyDatabase(this IContainer container)
         {
             container.RegisterInstance<IMainDatabase>(new MainDatabase(null));
+
+            return container;
+        }
+
+        public static IContainer AddDummyLogDatabase(this IContainer container)
+        {
             container.RegisterInstance<ILogDatabase>(new LogDatabase(null));
 
             return container;

src/NzbDrone.Core/Update/History/UpdateHistoryService.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Update.History.Events;
@@ -18,13 +19,15 @@ namespace NzbDrone.Core.Update.History
     {
         private readonly IUpdateHistoryRepository _repository;
         private readonly IEventAggregator _eventAggregator;
+        private readonly IConfigFileProvider _configFileProvider;
         private readonly Logger _logger;
         private Version _prevVersion;
 
-        public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, Logger logger)
+        public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, IConfigFileProvider configFileProvider, Logger logger)
         {
             _repository = repository;
             _eventAggregator = eventAggregator;
+            _configFileProvider = configFileProvider;
             _logger = logger;
         }
 
@@ -58,7 +61,7 @@ namespace NzbDrone.Core.Update.History
 
         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
                 return;

src/NzbDrone.Core/Update/RecentUpdateProvider.cs

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

src/NzbDrone.Host/Bootstrap.cs

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

src/NzbDrone.Host/Startup.cs

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

src/Sonarr.Api.V3/Logs/LogController.cs

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

src/Sonarr.Api.V3/Update/UpdateController.cs

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

src/Sonarr.Http/PagingResource.cs

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