Merge pull request #419 from jellyfin/dev

Master 10.0.0

3 files changed, 8 insertions, 118 deletions

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index 05fb08447..c60f59ce4 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Tasks;
 
 namespace Emby.Server.Implementations.ScheduledTasks.Tasks
@@ -132,11 +132,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
                     }
                     catch (UnauthorizedAccessException ex)
                     {
-                        _logger.ErrorException("Error deleting directory {0}", ex, directory);
+                        _logger.LogError(ex, "Error deleting directory {path}", directory);
                     }
                     catch (IOException ex)
                     {
-                        _logger.ErrorException("Error deleting directory {0}", ex, directory);
+                        _logger.LogError(ex, "Error deleting directory {path}", directory);
                     }
                 }
             }
@@ -150,11 +150,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             }
             catch (UnauthorizedAccessException ex)
             {
-                _logger.ErrorException("Error deleting file {0}", ex, path);
+                _logger.LogError(ex, "Error deleting file {path}", path);
             }
             catch (IOException ex)
             {
-                _logger.ErrorException("Error deleting file {0}", ex, path);
+                _logger.LogError(ex, "Error deleting file {path}", path);
             }
         }
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
index d5a7ccadb..b754d7cb5 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
@@ -56,7 +56,8 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             // Delete log files more than n days old
             var minDateModified = DateTime.UtcNow.AddDays(-ConfigurationManager.CommonConfiguration.LogFileRetentionDays);
 
-			var filesToDelete = _fileSystem.GetFiles(ConfigurationManager.CommonApplicationPaths.LogDirectoryPath, true)
+            // Only delete the .txt log files, the *.log files created by serilog get managed by itself
+            var filesToDelete = _fileSystem.GetFiles(ConfigurationManager.CommonApplicationPaths.LogDirectoryPath, new[] { ".txt" }, true, true)
                           .Where(f => _fileSystem.GetLastWriteTimeUtc(f) < minDateModified)
                           .ToList();
 
@@ -64,8 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 
             foreach (var file in filesToDelete)
             {
-                double percent = index;
-                percent /= filesToDelete.Count;
+                double percent = index / filesToDelete.Count;
 
                 progress.Report(100 * percent);
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
deleted file mode 100644
index fbc3a309e..000000000
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ReloadLoggerFileTask.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Tasks;
-
-namespace Emby.Server.Implementations.ScheduledTasks.Tasks
-{
-    /// <summary>
-    /// Class ReloadLoggerFileTask
-    /// </summary>
-    public class ReloadLoggerFileTask : IScheduledTask, IConfigurableScheduledTask
-    {
-        /// <summary>
-        /// Gets or sets the log manager.
-        /// </summary>
-        /// <value>The log manager.</value>
-        private ILogManager LogManager { get; set; }
-        /// <summary>
-        /// Gets or sets the configuration manager.
-        /// </summary>
-        /// <value>The configuration manager.</value>
-        private IConfigurationManager ConfigurationManager { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReloadLoggerFileTask" /> class.
-        /// </summary>
-        /// <param name="logManager">The logManager.</param>
-        /// <param name="configurationManager">The configuration manager.</param>
-        public ReloadLoggerFileTask(ILogManager logManager, IConfigurationManager configurationManager)
-        {
-            LogManager = logManager;
-            ConfigurationManager = configurationManager;
-        }
-
-        /// <summary>
-        /// Gets the default triggers.
-        /// </summary>
-        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
-        {
-            var trigger = new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerDaily, TimeOfDayTicks = TimeSpan.FromHours(0).Ticks }; //12am
-
-            return new[] { trigger };
-        }
-
-        /// <summary>
-        /// Executes the internal.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <returns>Task.</returns>
-        public Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            progress.Report(0);
-
-            return LogManager.ReloadLogger(ConfigurationManager.CommonConfiguration.EnableDebugLevelLogging
-                                        ? LogSeverity.Debug
-                                        : LogSeverity.Info, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get { return "Rotate log file"; }
-        }
-
-        public string Key { get; }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description
-        {
-            get { return "Moves logging to a new file to help reduce log file sizes."; }
-        }
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category
-        {
-            get { return "Application"; }
-        }
-
-        public bool IsHidden
-        {
-            get { return false; }
-        }
-
-        public bool IsEnabled
-        {
-            get { return true; }
-        }
-
-        public bool IsLogged
-        {
-            get { return true; }
-        }
-    }
-}