From 42101d302bd3e09e83a0719b223c4da318307e00 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 10 May 2014 19:00:28 -0700 Subject: [PATCH] Fixed: Ignore Priority monitor errors on mono --- src/NzbDrone.Core/Update/InstallUpdateService.cs | 2 +- src/NzbDrone.Host/PriorityMonitor.cs | 11 ++++++++++- src/UI/Series/Details/SeasonLayout.js | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs index da353fa33..140f94ba1 100644 --- a/src/NzbDrone.Core/Update/InstallUpdateService.cs +++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs @@ -55,7 +55,7 @@ namespace NzbDrone.Core.Update _diskProvider.DeleteFolder(updateSandboxFolder, true); } - _logger.ProgressInfo("Downloading update {0} [{1}]", updatePackage.Version, updatePackage.Branch); + _logger.ProgressInfo("Downloading update {0}", updatePackage.Version); _logger.Debug("Downloading update package from [{0}] to [{1}]", updatePackage.Url, packageDestination); _httpProvider.DownloadFile(updatePackage.Url, packageDestination); diff --git a/src/NzbDrone.Host/PriorityMonitor.cs b/src/NzbDrone.Host/PriorityMonitor.cs index 72eda2ac1..2972024dd 100644 --- a/src/NzbDrone.Host/PriorityMonitor.cs +++ b/src/NzbDrone.Host/PriorityMonitor.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Threading; using NLog; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Processes; namespace NzbDrone.Host @@ -36,7 +37,15 @@ namespace NzbDrone.Host } catch (Exception e) { - _logger.WarnException("Unable to verify priority", e); + if (OsInfo.IsMono) + { + _logger.TraceException("Unable to verify priority", e); + } + + else + { + _logger.WarnException("Unable to verify priority", e); + } } } } diff --git a/src/UI/Series/Details/SeasonLayout.js b/src/UI/Series/Details/SeasonLayout.js index 6a0ee80d4..f9f3f08b3 100644 --- a/src/UI/Series/Details/SeasonLayout.js +++ b/src/UI/Series/Details/SeasonLayout.js @@ -92,7 +92,6 @@ define( initialize: function (options) { - if (!options.episodeCollection) { throw 'episodeCollection is needed'; }