From dda7868215e6f4d5877d643211c7867ffd6f19d7 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 21 Nov 2012 08:14:57 -0800 Subject: [PATCH] Cleaned up a bunch of warnings --- NzbDrone.Core.Test/IndexerTests.cs | 2 -- NzbDrone.Core/Parser.cs | 3 +-- NzbDrone.Core/Providers/DiskScanProvider.cs | 1 + NzbDrone.Core/Providers/NewznabProvider.cs | 1 + NzbDrone.Core/Providers/SignalRProvider.cs | 3 +-- NzbDrone.Core/Providers/SmtpProvider.cs | 1 + .../Providers/SceneMappingProvider.cs | 5 +++++ NzbDrone.Update.Test/NzbDrone.Update.Test.csproj | 4 ++-- NzbDrone.Web/Controllers/CommandController.cs | 4 ++++ 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs index e2a14f3bb..47e549b62 100644 --- a/NzbDrone.Core.Test/IndexerTests.cs +++ b/NzbDrone.Core.Test/IndexerTests.cs @@ -596,7 +596,6 @@ namespace NzbDrone.Core.Test WithConfiguredIndexers(); const string fileName = "wombles.xml"; - const string expectedString = "nzbdetails"; Mocker.GetMock() .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny())) @@ -635,7 +634,6 @@ namespace NzbDrone.Core.Test { WithConfiguredIndexers(); - const string fileName = "nzbindex.xml"; const string expectedString = "release"; Mocker.GetMock() diff --git a/NzbDrone.Core/Parser.cs b/NzbDrone.Core/Parser.cs index e6da55dc7..04bc153ce 100644 --- a/NzbDrone.Core/Parser.cs +++ b/NzbDrone.Core/Parser.cs @@ -220,8 +220,7 @@ namespace NzbDrone.Core } parsedEpisode = new EpisodeParseResult - { - + { AirDate = new DateTime(airyear, airmonth, airday).Date, }; } diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs index f51e6e95b..a780756ab 100644 --- a/NzbDrone.Core/Providers/DiskScanProvider.cs +++ b/NzbDrone.Core/Providers/DiskScanProvider.cs @@ -206,6 +206,7 @@ namespace NzbDrone.Core.Providers catch (UnauthorizedAccessException ex) { Logger.Debug("Unable to apply folder permissions to: ", newFile.FullName); + Logger.TraceException(ex.Message, ex); } episodeFile.Path = newFile.FullName; diff --git a/NzbDrone.Core/Providers/NewznabProvider.cs b/NzbDrone.Core/Providers/NewznabProvider.cs index f789c973f..b3eab5b7b 100644 --- a/NzbDrone.Core/Providers/NewznabProvider.cs +++ b/NzbDrone.Core/Providers/NewznabProvider.cs @@ -140,6 +140,7 @@ namespace NzbDrone.Core.Providers catch (Exception ex) { Logger.Error("Invalid address {0}, please correct the site URL.", url); + Logger.TraceException(ex.Message, ex); throw; } diff --git a/NzbDrone.Core/Providers/SignalRProvider.cs b/NzbDrone.Core/Providers/SignalRProvider.cs index 671c8d058..99d37372b 100644 --- a/NzbDrone.Core/Providers/SignalRProvider.cs +++ b/NzbDrone.Core/Providers/SignalRProvider.cs @@ -28,11 +28,10 @@ namespace NzbDrone.Core.Providers EpisodeStatus = episodeStatus.ToString(), Quality = (quality == null ? String.Empty : quality.Quality.ToString()) }); - var test = 0; } catch (Exception ex) { - logger.Trace("Error"); + logger.TraceException("Error", ex); throw; } } diff --git a/NzbDrone.Core/Providers/SmtpProvider.cs b/NzbDrone.Core/Providers/SmtpProvider.cs index e0f831dcc..025c23657 100644 --- a/NzbDrone.Core/Providers/SmtpProvider.cs +++ b/NzbDrone.Core/Providers/SmtpProvider.cs @@ -61,6 +61,7 @@ namespace NzbDrone.Core.Providers catch(Exception ex) { Logger.Error("Error sending email. Subject: {0}", email.Subject); + Logger.TraceException(ex.Message, ex); } } diff --git a/NzbDrone.Services/NzbDrone.Services.Service/Providers/SceneMappingProvider.cs b/NzbDrone.Services/NzbDrone.Services.Service/Providers/SceneMappingProvider.cs index 1ff2519ef..36daef8b1 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/Providers/SceneMappingProvider.cs +++ b/NzbDrone.Services/NzbDrone.Services.Service/Providers/SceneMappingProvider.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using NLog; using NzbDrone.Services.Service.Repository; using Services.PetaPoco; @@ -11,6 +12,8 @@ namespace NzbDrone.Services.Service.Providers { private readonly IDatabase _database; + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); + public SceneMappingProvider(IDatabase database) { _database = database; @@ -74,6 +77,7 @@ namespace NzbDrone.Services.Service.Providers } catch (Exception ex) { + logger.WarnException("Unable to promote scene mapping", ex); return false; } @@ -93,6 +97,7 @@ namespace NzbDrone.Services.Service.Providers } catch (Exception ex) { + logger.WarnException("Unable to promote all scene mappings", ex); return false; } diff --git a/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 16a00c2c9..acaa83dec 100644 --- a/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -80,11 +80,11 @@ NzbDrone.Common - {CADDFCE0-7509-4430-8364-2074E1EEFCA2} + {caddfce0-7509-4430-8364-2074e1eefca2} NzbDrone.Test.Common - {4CCC53CD-8D5E-4CC4-97D2-5C9312AC2BD7} + {4ccc53cd-8d5e-4cc4-97d2-5c9312ac2bd7} NzbDrone.Update diff --git a/NzbDrone.Web/Controllers/CommandController.cs b/NzbDrone.Web/Controllers/CommandController.cs index bc1b0cf68..1bfe2ee50 100644 --- a/NzbDrone.Web/Controllers/CommandController.cs +++ b/NzbDrone.Web/Controllers/CommandController.cs @@ -1,4 +1,5 @@ using System.Web.Mvc; +using NLog; using NzbDrone.Core.Jobs; using NzbDrone.Core.Providers; using NzbDrone.Core.Providers.DownloadClients; @@ -21,6 +22,8 @@ namespace NzbDrone.Web.Controllers private readonly XbmcProvider _xbmcProvider; private readonly PlexProvider _plexProvider; + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); + public CommandController(JobProvider jobProvider, SabProvider sabProvider, SmtpProvider smtpProvider, TwitterProvider twitterProvider, EpisodeProvider episodeProvider, GrowlProvider growlProvider, @@ -133,6 +136,7 @@ namespace NzbDrone.Web.Controllers } catch(Exception ex) { + logger.TraceException(ex.Message, ex); return JsonNotificationResult.Oops("Couldn't register and test Growl"); } }