From 73840dcacc096101dfae1af9565832144de52646 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Thu, 5 Jan 2017 15:32:17 -0800 Subject: [PATCH] The great logger.Error cleanup! --- src/NzbDrone.Api/Indexers/ReleaseModule.cs | 4 +- src/NzbDrone.Common/Disk/DiskProviderBase.cs | 20 ++++---- .../Disk/DiskTransferService.cs | 8 ++-- src/NzbDrone.Common/Http/HttpClient.cs | 2 +- .../GlobalExceptionHandlers.cs | 2 +- .../Instrumentation/Sentry/SentryTarget.cs | 2 +- .../Processes/PidFileProvider.cs | 2 +- .../Processes/ProcessProvider.cs | 12 ++--- .../Scene/SceneMappingService.cs | 2 +- .../DataAugmentation/Xem/XemService.cs | 2 +- .../Datastore/BasicRepository.cs | 2 +- .../Migration/Framework/MigrationLogger.cs | 2 +- .../DecisionEngine/DownloadDecisionMaker.cs | 6 +-- .../Download/Clients/Deluge/Deluge.cs | 10 ++-- .../Download/Clients/NzbVortex/NzbVortex.cs | 4 +- .../Download/Clients/Nzbget/Nzbget.cs | 6 +-- .../Clients/QBittorrent/QBittorrent.cs | 10 ++-- .../Download/Clients/Sabnzbd/Sabnzbd.cs | 4 +- .../Clients/Transmission/TransmissionBase.cs | 10 ++-- .../Download/Clients/rTorrent/RTorrent.cs | 6 +-- .../Download/Clients/uTorrent/UTorrent.cs | 10 ++-- .../Download/DownloadEventHub.cs | 2 +- .../DownloadMonitoringService.cs | 2 +- .../Metadata/Consumers/Xbmc/XbmcMetadata.cs | 18 +++---- .../HealthCheck/Checks/DownloadClientCheck.cs | 7 +-- .../HealthCheck/Checks/MediaInfoDllCheck.cs | 2 +- .../HealthCheck/Checks/ProxyCheck.cs | 8 ++-- .../Housekeepers/DeleteBadMediaCovers.cs | 2 +- .../Housekeeping/HousekeepingService.cs | 2 +- .../IndexerSearch/EpisodeSearchService.cs | 6 +-- .../IndexerSearch/NzbSearchService.cs | 8 ++-- src/NzbDrone.Core/Indexers/HttpIndexerBase.cs | 5 +- src/NzbDrone.Core/Indexers/RssParser.cs | 2 +- .../Instrumentation/DatabaseTarget.cs | 2 +- .../MediaCover/MediaCoverService.cs | 4 +- .../MediaFiles/EpisodeFileMovingService.cs | 10 ++-- .../MediaFiles/EpisodeImport/DetectSample.cs | 1 - .../EpisodeImport/ImportDecisionMaker.cs | 6 +-- .../Specifications/FreeSpaceSpecification.cs | 6 +-- .../MediaFiles/MediaFileAttributeService.cs | 4 +- .../MediaFileTableCleanupService.cs | 3 +- .../MediaInfo/VideoFileInfoReader.cs | 47 +++++++++---------- .../MediaFiles/RecycleBinProvider.cs | 3 +- .../MediaFiles/RenameEpisodeFileService.cs | 18 +++---- .../Messaging/Commands/CommandExecutor.cs | 10 ++-- .../Messaging/Events/EventAggregator.cs | 4 +- .../Notifications/Boxcar/BoxcarProxy.cs | 8 ++-- .../Notifications/Email/EmailService.cs | 2 +- .../Notifications/Growl/GrowlService.cs | 2 +- .../Notifications/Join/JoinProxy.cs | 2 +- .../MediaBrowser/MediaBrowserService.cs | 2 +- .../Notifications/NotificationService.cs | 9 ++-- .../NotifyMyAndroid/NotifyMyAndroidProxy.cs | 2 +- .../Notifications/Plex/PlexClientService.cs | 2 +- .../Notifications/Plex/PlexServerService.cs | 4 +- .../Notifications/Prowl/ProwlService.cs | 2 +- .../PushBullet/PushBulletProxy.cs | 12 ++--- .../Notifications/Pushalot/PushalotProxy.cs | 10 ++-- .../Notifications/Pushover/PushoverService.cs | 2 +- .../Notifications/Telegram/TelegramService.cs | 2 +- .../Notifications/Twitter/TwitterService.cs | 2 +- .../Notifications/Xbmc/XbmcService.cs | 2 +- src/NzbDrone.Core/Parser/Parser.cs | 4 +- .../RootFolders/RootFolderService.cs | 2 +- src/NzbDrone.Core/Tv/MoveSeriesService.cs | 4 +- src/NzbDrone.Core/Tv/RefreshEpisodeService.cs | 2 +- src/NzbDrone.Core/Tv/RefreshSeriesService.cs | 6 +-- .../Update/InstallUpdateService.cs | 2 +- src/NzbDrone.Host/BrowserService.cs | 2 +- src/NzbDrone.Host/PlatformValidation.cs | 4 +- src/NzbDrone.Mono/Disk/DiskProvider.cs | 6 +-- .../UpdateEngine/StartNzbDrone.cs | 2 +- src/NzbDrone.sln.DotSettings | 2 + 73 files changed, 201 insertions(+), 208 deletions(-) diff --git a/src/NzbDrone.Api/Indexers/ReleaseModule.cs b/src/NzbDrone.Api/Indexers/ReleaseModule.cs index 5729af932..6a31ec0b9 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseModule.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseModule.cs @@ -68,7 +68,7 @@ namespace NzbDrone.Api.Indexers } catch (ReleaseDownloadException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed"); } @@ -96,7 +96,7 @@ namespace NzbDrone.Api.Indexers } catch (Exception ex) { - _logger.Error(ex, "Episode search failed: " + ex.Message); + _logger.Error(ex, "Episode search failed"); } return new List(); diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs index 41de39866..6763709a5 100644 --- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs +++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs @@ -108,16 +108,16 @@ namespace NzbDrone.Common.Disk switch (stringComparison) { - case StringComparison.CurrentCulture: - case StringComparison.InvariantCulture: - case StringComparison.Ordinal: - { - return File.Exists(path) && path == path.GetActualCasing(); - } + case StringComparison.CurrentCulture: + case StringComparison.InvariantCulture: + case StringComparison.Ordinal: + { + return File.Exists(path) && path == path.GetActualCasing(); + } default: - { - return File.Exists(path); - } + { + return File.Exists(path); + } } } @@ -128,7 +128,7 @@ namespace NzbDrone.Common.Disk try { var testPath = Path.Combine(path, "sonarr_write_test.txt"); - var testContent = string.Format("This file was created to verify if '{0}' is writable. It should've been automatically deleted. Feel free to delete it.", path); + var testContent = $"This file was created to verify if '{path}' is writable. It should've been automatically deleted. Feel free to delete it."; File.WriteAllText(testPath, testContent); File.Delete(testPath); return true; diff --git a/src/NzbDrone.Common/Disk/DiskTransferService.cs b/src/NzbDrone.Common/Disk/DiskTransferService.cs index 3345d7f9b..8e7a05fe7 100644 --- a/src/NzbDrone.Common/Disk/DiskTransferService.cs +++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs @@ -352,7 +352,7 @@ namespace NzbDrone.Common.Disk } catch (Exception ex) { - _logger.Error(ex, string.Format("Failed to properly rollback the file move [{0}] to [{1}], incomplete file may be left in target path.", sourcePath, targetPath)); + _logger.Error(ex, "Failed to properly rollback the file move [{0}] to [{1}], incomplete file may be left in target path.", sourcePath, targetPath); } } @@ -368,7 +368,7 @@ namespace NzbDrone.Common.Disk } catch (Exception ex) { - _logger.Error(ex, string.Format("Failed to properly rollback the file move [{0}] to [{1}], file may be left in target path.", sourcePath, targetPath)); + _logger.Error(ex, "Failed to properly rollback the file move [{0}] to [{1}], file may be left in target path.", sourcePath, targetPath); } } @@ -387,7 +387,7 @@ namespace NzbDrone.Common.Disk } catch (Exception ex) { - _logger.Error(ex, string.Format("Failed to properly rollback the file copy [{0}] to [{1}], file may be left in target path.", sourcePath, targetPath)); + _logger.Error(ex, "Failed to properly rollback the file copy [{0}] to [{1}], file may be left in target path.", sourcePath, targetPath); } } @@ -429,7 +429,7 @@ namespace NzbDrone.Common.Disk if (i == RetryCount) { - _logger.Error("Failed to completely transfer [{0}] to [{1}], aborting.", sourcePath, targetPath, i + 1, RetryCount); + _logger.Error("Failed to completely transfer [{0}] to [{1}], aborting.", sourcePath, targetPath); } else { diff --git a/src/NzbDrone.Common/Http/HttpClient.cs b/src/NzbDrone.Common/Http/HttpClient.cs index 3a9e883cd..849647f64 100644 --- a/src/NzbDrone.Common/Http/HttpClient.cs +++ b/src/NzbDrone.Common/Http/HttpClient.cs @@ -90,7 +90,7 @@ namespace NzbDrone.Common.Http response.StatusCode == HttpStatusCode.MovedPermanently || response.StatusCode == HttpStatusCode.Found)) { - _logger.Error("Server requested a redirect to [" + response.Headers["Location"] + "]. Update the request URL to avoid this redirect."); + _logger.Error("Server requested a redirect to [{0}]. Update the request URL to avoid this redirect.", response.Headers["Location"]); } if (!request.SuppressHttpError && response.HasHttpError) diff --git a/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs b/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs index b56c306a9..fbcbf4dcb 100644 --- a/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs +++ b/src/NzbDrone.Common/Instrumentation/GlobalExceptionHandlers.cs @@ -19,7 +19,7 @@ namespace NzbDrone.Common.Instrumentation var exception = e.Exception; Console.WriteLine("Task Error: {0}", exception); - Logger.Error(exception, "Task Error: " + exception.Message); + Logger.Error(exception, "Task Error"); } private static void HandleAppDomainException(object sender, UnhandledExceptionEventArgs e) diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs index 07cc995e8..23237c6c8 100644 --- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs +++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs @@ -125,7 +125,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry } catch (Exception e) { - InternalLogger.Error("Unable to send Sentry request: {0}", e.Message); + InternalLogger.Error(e, "Unable to send Sentry request"); } } } diff --git a/src/NzbDrone.Common/Processes/PidFileProvider.cs b/src/NzbDrone.Common/Processes/PidFileProvider.cs index 17e781225..c04ff445f 100644 --- a/src/NzbDrone.Common/Processes/PidFileProvider.cs +++ b/src/NzbDrone.Common/Processes/PidFileProvider.cs @@ -37,7 +37,7 @@ namespace NzbDrone.Common.Processes } catch (Exception ex) { - _logger.Error(ex, "Unable to write PID file: " + filename); + _logger.Error(ex, "Unable to write PID file {0}", filename); throw; } } diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs index 79bb16769..49e61c621 100644 --- a/src/NzbDrone.Common/Processes/ProcessProvider.cs +++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs @@ -98,9 +98,9 @@ namespace NzbDrone.Common.Processes var process = new Process { StartInfo = new ProcessStartInfo(url) - { - UseShellExecute = true - } + { + UseShellExecute = true + } }; process.Start(); @@ -136,9 +136,9 @@ namespace NzbDrone.Common.Processes logger.Debug("Starting {0} {1}", path, args); var process = new Process - { - StartInfo = startInfo - }; + { + StartInfo = startInfo + }; process.OutputDataReceived += (sender, eventArgs) => { diff --git a/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs b/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs index caa04ae42..44385a88f 100644 --- a/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs +++ b/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs @@ -181,7 +181,7 @@ namespace NzbDrone.Core.DataAugmentation.Scene } catch (Exception ex) { - _logger.Error(ex, "Failed to Update Scene Mappings:"); + _logger.Error(ex, "Failed to Update Scene Mappings."); } } diff --git a/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs b/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs index d42ca07ea..c80cd8c92 100644 --- a/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs +++ b/src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs @@ -83,7 +83,7 @@ namespace NzbDrone.Core.DataAugmentation.Xem } catch (Exception ex) { - _logger.Error(ex, "Error updating scene numbering mappings for: " + series); + _logger.Error(ex, "Error updating scene numbering mappings for {0}", series); } } diff --git a/src/NzbDrone.Core/Datastore/BasicRepository.cs b/src/NzbDrone.Core/Datastore/BasicRepository.cs index db36edc1e..b2afafdc4 100644 --- a/src/NzbDrone.Core/Datastore/BasicRepository.cs +++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs @@ -85,7 +85,7 @@ namespace NzbDrone.Core.Datastore if (result.Count != idList.Count()) { - throw new ApplicationException("Expected query to return {0} rows but returned {1}".Inject(idList.Count(), result.Count)); + throw new ApplicationException($"Expected query to return {idList.Count} rows but returned {result.Count}"); } return result; diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs index 97201abee..3418dd921 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework public void Error(Exception exception) { - _logger.Error(exception, exception.Message); + _logger.Error(exception); } public void Write(string message, bool escaped) diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs index d86653478..bb1a70873 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs @@ -84,7 +84,7 @@ namespace NzbDrone.Core.DecisionEngine } else if (remoteEpisode.Episodes.Empty()) { - decision = new DownloadDecision(remoteEpisode, new Rejection("Unable to parse episodes from release name")); + decision = new DownloadDecision(remoteEpisode, new Rejection("Unable to parse episodes from release name")); } else { @@ -143,8 +143,8 @@ namespace NzbDrone.Core.DecisionEngine { e.Data.Add("report", remoteEpisode.Release.ToJson()); e.Data.Add("parsed", remoteEpisode.ParsedEpisodeInfo.ToJson()); - _logger.Error(e, "Couldn't evaluate decision on " + remoteEpisode.Release.Title); - return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message)); + _logger.Error(e, "Couldn't evaluate decision on {0}", remoteEpisode.Release.Title); + return new Rejection($"{spec.GetType().Name}: {e.Message}"); } return null; diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs index 39174d3b8..6e4d023a0 100644 --- a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs +++ b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs @@ -94,7 +94,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex, "Couldn't get list of torrents"); return Enumerable.Empty(); } @@ -198,12 +198,12 @@ namespace NzbDrone.Core.Download.Clients.Deluge } catch (DownloadClientAuthenticationException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure("Password", "Authentication failed"); } catch (WebException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); switch (ex.Status) { case WebExceptionStatus.ConnectFailure: @@ -227,7 +227,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message); } @@ -278,7 +278,7 @@ namespace NzbDrone.Core.Download.Clients.Deluge } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Failed to get the list of torrents: " + ex.Message); } diff --git a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs index 6d45f0386..dc3595615 100644 --- a/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs +++ b/src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortex.cs @@ -166,7 +166,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new ValidationFailure("Host", "Unable to connect to NZBVortex"); } @@ -187,7 +187,7 @@ namespace NzbDrone.Core.Download.Clients.NzbVortex } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new ValidationFailure("Host", "Unable to connect to NZBVortex"); } diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs index 5b6d756cc..aa05aec26 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs @@ -56,7 +56,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -120,7 +120,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -286,7 +286,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget { return new ValidationFailure("Username", "Authentication failed"); } - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new ValidationFailure("Host", "Unable to connect to NZBGet"); } diff --git a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs index ecd75c911..55eec2682 100644 --- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs @@ -85,7 +85,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -226,7 +226,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent } catch (DownloadClientAuthenticationException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure("Username", "Authentication failure") { DetailedDescription = "Please verify your username and password." @@ -234,7 +234,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent } catch (WebException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); if (ex.Status == WebExceptionStatus.ConnectFailure) { return new NzbDroneValidationFailure("Host", "Unable to connect") @@ -246,7 +246,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(String.Empty, "Unknown exception: " + ex.Message); } @@ -261,7 +261,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(String.Empty, "Failed to get the list of torrents: " + ex.Message); } diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index 64a5e23de..dc97ef308 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -118,7 +118,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -381,7 +381,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new ValidationFailure("Host", "Unable to connect to SABnzbd"); } } diff --git a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs index 8358e9e79..3fa69c06b 100644 --- a/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs +++ b/src/NzbDrone.Core/Download/Clients/Transmission/TransmissionBase.cs @@ -41,7 +41,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -204,7 +204,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission } catch (DownloadClientAuthenticationException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure("Username", "Authentication failure") { DetailedDescription = string.Format("Please verify your username and password. Also verify if the host running Sonarr isn't blocked from accessing {0} by WhiteList limitations in the {0} configuration.", Name) @@ -212,7 +212,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission } catch (WebException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); if (ex.Status == WebExceptionStatus.ConnectFailure) { return new NzbDroneValidationFailure("Host", "Unable to connect") @@ -224,7 +224,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message); } } @@ -239,7 +239,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Failed to get the list of torrents: " + ex.Message); } diff --git a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs index 041708a93..bfbc62cbe 100644 --- a/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs @@ -147,7 +147,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -196,7 +196,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message); } @@ -211,7 +211,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Failed to get the list of torrents: " + ex.Message); } diff --git a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs index da942b7f1..8f442eb7b 100644 --- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs +++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs @@ -105,7 +105,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent } catch (DownloadClientException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return Enumerable.Empty(); } @@ -232,7 +232,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent } catch (DownloadClientAuthenticationException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure("Username", "Authentication failure") { DetailedDescription = "Please verify your username and password." @@ -240,7 +240,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent } catch (WebException ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); if (ex.Status == WebExceptionStatus.ConnectFailure) { return new NzbDroneValidationFailure("Host", "Unable to connect") @@ -252,7 +252,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Unknown exception: " + ex.Message); } @@ -267,7 +267,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent } catch (Exception ex) { - _logger.Error(ex, ex.Message); + _logger.Error(ex); return new NzbDroneValidationFailure(string.Empty, "Failed to get the list of torrents: " + ex.Message); } diff --git a/src/NzbDrone.Core/Download/DownloadEventHub.cs b/src/NzbDrone.Core/Download/DownloadEventHub.cs index 6d910292c..f738f5c2e 100644 --- a/src/NzbDrone.Core/Download/DownloadEventHub.cs +++ b/src/NzbDrone.Core/Download/DownloadEventHub.cs @@ -74,7 +74,7 @@ namespace NzbDrone.Core.Download } catch (Exception e) { - _logger.Error(e, "Couldn't remove item from client " + trackedDownload.DownloadItem.Title); + _logger.Error(e, "Couldn't remove item from client {0}", trackedDownload.DownloadItem.Title); } } } diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs index cf9124d19..dcaefd073 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs @@ -135,7 +135,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads } catch (Exception e) { - _logger.Error(e, "Couldn't process tracked download " + downloadItem.Title); + _logger.Error(e, "Couldn't process tracked download {0}", downloadItem.Title); } return trackedDownloads; diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs index 9e9d472ab..99e384cb9 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs @@ -58,11 +58,11 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc if (filename == null) return null; var metadata = new MetadataFile - { - SeriesId = series.Id, - Consumer = GetType().Name, - RelativePath = series.Path.GetRelativePath(path) - }; + { + SeriesId = series.Id, + Consumer = GetType().Name, + RelativePath = series.Path.GetRelativePath(path) + }; if (SeriesImagesRegex.IsMatch(filename)) { @@ -93,7 +93,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc { return null; } - + return metadata; } @@ -245,7 +245,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc var streamDetails = new XElement("streamdetails"); var video = new XElement("video"); - video.Add(new XElement("aspect", (float) episodeFile.MediaInfo.Width / (float) episodeFile.MediaInfo.Height)); + video.Add(new XElement("aspect", (float)episodeFile.MediaInfo.Width / (float)episodeFile.MediaInfo.Height)); video.Add(new XElement("bitrate", episodeFile.MediaInfo.VideoBitrate)); video.Add(new XElement("codec", episodeFile.MediaInfo.VideoCodec)); video.Add(new XElement("framerate", episodeFile.MediaInfo.VideoFps)); @@ -338,8 +338,8 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc } catch (Exception ex) { - _logger.Error(ex, "Unable to process episode image for file: " + Path.Combine(series.Path, episodeFile.RelativePath)); - + _logger.Error(ex, "Unable to process episode image for file: {0}", Path.Combine(series.Path, episodeFile.RelativePath)); + return new List(); } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs index f82e37e1b..d99eed1a3 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs @@ -33,10 +33,11 @@ namespace NzbDrone.Core.HealthCheck.Checks } catch (Exception ex) { - var message = String.Format("Unable to communicate with {0}.", downloadClient.Definition.Name); - _logger.Error(ex, message); - return new HealthCheck(GetType(), HealthCheckResult.Error, message + " " + ex.Message); + _logger.Error(ex, "Unable to communicate with {0}", downloadClient.Definition.Name); + + var message = $"Unable to communicate with {downloadClient.Definition.Name}."; + return new HealthCheck(GetType(), HealthCheckResult.Error, $"{message} {ex.Message}"); } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MediaInfoDllCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MediaInfoDllCheck.cs index 94ea38710..5b5a9f3f4 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MediaInfoDllCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MediaInfoDllCheck.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Core.HealthCheck.Checks } catch (Exception e) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "MediaInfo could not be loaded " + e.Message); + return new HealthCheck(GetType(), HealthCheckResult.Warning, $"MediaInfo Library could not be loaded {e.Message}"); } return new HealthCheck(GetType()); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs index 1732c549e..d9c4d700c 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Core.HealthCheck.Checks if (_configService.ProxyEnabled) { var addresses = Dns.GetHostAddresses(_configService.ProxyHostname); - if(!addresses.Any()) + if (!addresses.Any()) { return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to resolve the IP Address for the Configured Proxy Host {0}", _configService.ProxyHostname)); } @@ -47,13 +47,13 @@ namespace NzbDrone.Core.HealthCheck.Checks if (response.StatusCode == HttpStatusCode.BadRequest) { _logger.Error("Proxy Health Check failed: {0}", response.StatusCode); - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: StatusCode {1}", request.Url, response.StatusCode)); + return new HealthCheck(GetType(), HealthCheckResult.Error, $"Failed to test proxy. StatusCode: {response.StatusCode}"); } } catch (Exception ex) { - _logger.Error(ex, "Proxy Health Check failed: {0}", ex.Message); - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: {1}", request.Url, ex.Message)); + _logger.Error(ex, "Proxy Health Check failed"); + return new HealthCheck(GetType(), HealthCheckResult.Error, $"Failed to test proxy: {request.Url}"); } } diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/DeleteBadMediaCovers.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/DeleteBadMediaCovers.cs index f1744abec..0bd74614b 100644 --- a/src/NzbDrone.Core/Housekeeping/Housekeepers/DeleteBadMediaCovers.cs +++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/DeleteBadMediaCovers.cs @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers } catch (Exception e) { - _logger.Error(e, "Couldn't validate image " + image.RelativePath); + _logger.Error(e, "Couldn't validate image {0}", image.RelativePath); } } } diff --git a/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs b/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs index c36ace89d..eb8cedd9e 100644 --- a/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs +++ b/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Housekeeping } catch (Exception ex) { - _logger.Error(ex, "Error running housekeeping task: " + housekeeper.GetType().Name); + _logger.Error(ex, "Error running housekeeping task: {0}", housekeeper.GetType().Name); } } diff --git a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs index 4ae7418a8..6762fbaa2 100644 --- a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs @@ -53,8 +53,7 @@ namespace NzbDrone.Core.IndexerSearch } catch (Exception ex) { - var message = String.Format("Unable to search for missing episodes in season {0} of [{1}]", season.Key, series.Key); - _logger.Error(ex, message); + _logger.Error(ex, "Unable to search for missing episodes in season {0} of [{1}]", season.Key, series.Key); continue; } } @@ -67,8 +66,7 @@ namespace NzbDrone.Core.IndexerSearch } catch (Exception ex) { - var message = String.Format("Unable to search for missing episode: [{0}]", season.First()); - _logger.Error(ex, message); + _logger.Error(ex, "Unable to search for missing episode: [{0}]", season.First()); continue; } } diff --git a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs index cff3e290c..7c5eb1060 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs @@ -120,7 +120,7 @@ namespace NzbDrone.Core.IndexerSearch { var episode = sceneSeasonEpisodes.First(); var searchSpec = Get(series, sceneSeasonEpisodes.ToList(), userInvokedSearch); - + searchSpec.SeasonNumber = sceneSeasonEpisodes.Key; searchSpec.MonitoredEpisodesOnly = true; @@ -160,7 +160,7 @@ namespace NzbDrone.Core.IndexerSearch private List SearchSingle(Series series, Episode episode, bool userInvokedSearch) { - var searchSpec = Get(series, new List{episode}, userInvokedSearch); + var searchSpec = Get(series, new List { episode }, userInvokedSearch); if (series.UseSceneNumbering && episode.SceneSeasonNumber.HasValue && episode.SceneEpisodeNumber.HasValue) { @@ -179,7 +179,7 @@ namespace NzbDrone.Core.IndexerSearch private List SearchDaily(Series series, Episode episode, bool userInvokedSearch) { var airDate = DateTime.ParseExact(episode.AirDate, Episode.AIR_DATE_FORMAT, CultureInfo.InvariantCulture); - var searchSpec = Get(series, new List{ episode }, userInvokedSearch); + var searchSpec = Get(series, new List { episode }, userInvokedSearch); searchSpec.AirDate = airDate; return Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec); @@ -272,7 +272,7 @@ namespace NzbDrone.Core.IndexerSearch } catch (Exception e) { - _logger.Error(e, "Error while searching for " + criteriaBase); + _logger.Error(e, "Error while searching for {0}", criteriaBase); } }).LogExceptions()); } diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs index 99ad741ca..b88158b14 100644 --- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs @@ -260,14 +260,13 @@ namespace NzbDrone.Core.Indexers catch (IndexerException ex) { _indexerStatusService.RecordFailure(Definition.Id); - var message = string.Format("{0} - {1}", ex.Message, url); - _logger.Warn(ex, message); + _logger.Warn(ex, "{0}", url); } catch (Exception feedEx) { _indexerStatusService.RecordFailure(Definition.Id); feedEx.Data.Add("FeedUrl", url); - _logger.Error(feedEx, "An error occurred while processing feed. " + url); + _logger.Error(feedEx, "An error occurred while processing feed. {0}", url); } return CleanupReleases(releases); diff --git a/src/NzbDrone.Core/Indexers/RssParser.cs b/src/NzbDrone.Core/Indexers/RssParser.cs index d2c03cfa4..6006695db 100644 --- a/src/NzbDrone.Core/Indexers/RssParser.cs +++ b/src/NzbDrone.Core/Indexers/RssParser.cs @@ -66,7 +66,7 @@ namespace NzbDrone.Core.Indexers catch (Exception itemEx) { itemEx.Data.Add("Item", item.Title()); - _logger.Error(itemEx, "An error occurred while processing feed item from " + indexerResponse.Request.Url); + _logger.Error(itemEx, "An error occurred while processing feed item from {0}", indexerResponse.Request.Url); } } diff --git a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs index f69de8224..1c36b91a8 100644 --- a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs +++ b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs @@ -97,7 +97,7 @@ namespace NzbDrone.Core.Instrumentation } catch (SQLiteException ex) { - InternalLogger.Error("Unable to save log event to database: {0}", ex); + InternalLogger.Error(ex, "Unable to save log event to database"); throw; } } diff --git a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs index deb2b35a5..f8e7b652b 100644 --- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs +++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs @@ -99,11 +99,11 @@ namespace NzbDrone.Core.MediaCover } catch (WebException e) { - _logger.Warn(string.Format("Couldn't download media cover for {0}. {1}", series, e.Message)); + _logger.Warn("Couldn't download media cover for {0}. {1}", series, e.Message); } catch (Exception e) { - _logger.Error(e, "Couldn't download media cover for " + series); + _logger.Error(e, "Couldn't download media cover for {0}", series); } EnsureResizedCovers(series, cover, !alreadyExists); diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs index 774ac202c..f2a0b9be6 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs @@ -64,7 +64,7 @@ namespace NzbDrone.Core.MediaFiles EnsureEpisodeFolder(episodeFile, series, episodes.Select(v => v.SeasonNumber).First(), filePath); _logger.Debug("Renaming episode file: {0} to {1}", episodeFile, filePath); - + return TransferFile(episodeFile, series, episodes, filePath, TransferMode.Move); } @@ -76,7 +76,7 @@ namespace NzbDrone.Core.MediaFiles EnsureEpisodeFolder(episodeFile, localEpisode, filePath); _logger.Debug("Moving episode file: {0} to {1}", episodeFile.Path, filePath); - + return TransferFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath, TransferMode.Move); } @@ -96,11 +96,11 @@ namespace NzbDrone.Core.MediaFiles _logger.Debug("Copying episode file: {0} to {1}", episodeFile.Path, filePath); return TransferFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath, TransferMode.Copy); } - + private EpisodeFile TransferFile(EpisodeFile episodeFile, Series series, List episodes, string destinationFilePath, TransferMode mode) { Ensure.That(episodeFile, () => episodeFile).IsNotNull(); - Ensure.That(series,() => series).IsNotNull(); + Ensure.That(series, () => series).IsNotNull(); Ensure.That(destinationFilePath, () => destinationFilePath).IsValidPath(); var episodeFilePath = episodeFile.Path ?? Path.Combine(series.Path, episodeFile.RelativePath); @@ -206,7 +206,7 @@ namespace NzbDrone.Core.MediaFiles } catch (IOException ex) { - _logger.Error(ex, "Unable to create directory: " + directoryName); + _logger.Error(ex, "Unable to create directory: {0}", directoryName); } _mediaFileAttributeService.SetFolderPermissions(directoryName); diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs index b517cd76c..27492d56a 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs @@ -81,7 +81,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport private bool CheckSize(long size, QualityModel quality) { - if (_largeSampleSizeQualities.Contains(quality.Quality)) { if (size < SampleSizeLimit * 2) { diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs index 8f03ca756..764e1b88f 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs @@ -111,7 +111,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport } catch (Exception e) { - _logger.Error(e, "Couldn't import file. " + file); + _logger.Error(e, "Couldn't import file. {0}", file); var localEpisode = new LocalEpisode { Path = file }; decision = new ImportDecision(localEpisode, new Rejection("Unexpected error processing file")); @@ -143,8 +143,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport { //e.Data.Add("report", remoteEpisode.Report.ToJson()); //e.Data.Add("parsed", remoteEpisode.ParsedEpisodeInfo.ToJson()); - _logger.Error(e, "Couldn't evaluate decision on " + localEpisode.Path); - return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message)); + _logger.Error(e, "Couldn't evaluate decision on {0}", localEpisode.Path); + return new Rejection($"{spec.GetType().Name}: {e.Message}"); } return null; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs index 158059e29..490bdb941 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications private readonly IConfigService _configService; private readonly Logger _logger; - public FreeSpaceSpecification(IDiskProvider diskProvider, IConfigService configService, Logger logger) + public FreeSpaceSpecification(IDiskProvider diskProvider, IConfigService configService, Logger logger) { _diskProvider = diskProvider; _configService = configService; @@ -54,11 +54,11 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications } catch (DirectoryNotFoundException ex) { - _logger.Error("Unable to check free disk space while importing. " + ex.Message); + _logger.Error(ex, "Unable to check free disk space while importing."); } catch (Exception ex) { - _logger.Error(ex, "Unable to check free disk space while importing: " + localEpisode.Path); + _logger.Error(ex, "Unable to check free disk space while importing. {0}", localEpisode.Path); } return Decision.Accept(); diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileAttributeService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileAttributeService.cs index a76c43abd..1db110a15 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileAttributeService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileAttributeService.cs @@ -42,12 +42,12 @@ namespace NzbDrone.Core.MediaFiles { if (ex is UnauthorizedAccessException || ex is InvalidOperationException || ex is FileNotFoundException) { - _logger.Debug("Unable to apply folder permissions to: ", path); + _logger.Debug("Unable to apply folder permissions to {0}", path); _logger.Debug(ex, ex.Message); } else { - _logger.Warn("Unable to apply folder permissions to: ", path); + _logger.Warn("Unable to apply folder permissions to: {0}", path); _logger.Warn(ex, ex.Message); } } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs index b275fb03e..0b7b2cba3 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs @@ -68,8 +68,7 @@ namespace NzbDrone.Core.MediaFiles catch (Exception ex) { - var errorMessage = string.Format("Unable to cleanup EpisodeFile in DB: {0}", episodeFile.Id); - _logger.Error(ex, errorMessage); + _logger.Error(ex, "Unable to cleanup EpisodeFile in DB: {0}", episodeFile.Id); } } diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs index 618e1159e..a1bf6aa86 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs @@ -113,7 +113,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo int.TryParse(aBitRate, out audioBitRate); int.TryParse(mediaInfo.Get(StreamKind.Audio, 0, "StreamCount"), out streamCount); - + string audioChannelsStr = mediaInfo.Get(StreamKind.Audio, 0, "Channel(s)"); int aCindex = audioChannelsStr.IndexOf(" /", StringComparison.InvariantCultureIgnoreCase); @@ -138,25 +138,25 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo int.TryParse(audioChannelsStr, out audioChannels); var mediaInfoModel = new MediaInfoModel - { - VideoCodec = mediaInfo.Get(StreamKind.Video, 0, "Codec/String"), - VideoBitrate = videoBitRate, - VideoBitDepth = videoBitDepth, - Height = height, - Width = width, - AudioFormat = mediaInfo.Get(StreamKind.Audio, 0, "Format"), - AudioBitrate = audioBitRate, - RunTime = GetBestRuntime(audioRuntime, videoRuntime, generalRuntime), - AudioStreamCount = streamCount, - AudioChannels = audioChannels, - AudioChannelPositions = audioChannelPositions, - AudioChannelPositionsText = audioChannelPositionsText, - AudioProfile = audioProfile.Trim(), - VideoFps = videoFrameRate, - AudioLanguages = audioLanguages, - Subtitles = subtitles, - ScanType = scanType - }; + { + VideoCodec = mediaInfo.Get(StreamKind.Video, 0, "Codec/String"), + VideoBitrate = videoBitRate, + VideoBitDepth = videoBitDepth, + Height = height, + Width = width, + AudioFormat = mediaInfo.Get(StreamKind.Audio, 0, "Format"), + AudioBitrate = audioBitRate, + RunTime = GetBestRuntime(audioRuntime, videoRuntime, generalRuntime), + AudioStreamCount = streamCount, + AudioChannels = audioChannels, + AudioChannelPositions = audioChannelPositions, + AudioChannelPositionsText = audioChannelPositionsText, + AudioProfile = audioProfile.Trim(), + VideoFps = videoFrameRate, + AudioLanguages = audioLanguages, + Subtitles = subtitles, + ScanType = scanType + }; return mediaInfoModel; } @@ -171,14 +171,11 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo } catch (Exception ex) { - _logger.Error(ex, "Unable to parse media info from file: " + filename); + _logger.Error(ex, "Unable to parse media info from file: {0}", filename); } finally { - if (mediaInfo != null) - { - mediaInfo.Close(); - } + mediaInfo?.Close(); } return null; diff --git a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs index 78ba4e8a9..520fbf676 100644 --- a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs +++ b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs @@ -117,8 +117,7 @@ namespace NzbDrone.Core.MediaFiles } catch (IOException e) { - var message = string.Format("Unable to move '{0}' to the recycling bin: '{1}'", path, destination); - _logger.Error(e, message); + _logger.Error(e, "Unable to move '{0}' to the recycling bin: '{1}'", path, destination); throw; } diff --git a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs index 5bde0cab6..4cfe84b37 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs @@ -96,14 +96,14 @@ namespace NzbDrone.Core.MediaFiles if (!episodeFilePath.PathEquals(newPath, StringComparison.Ordinal)) { yield return new RenameEpisodeFilePreview - { - SeriesId = series.Id, - SeasonNumber = seasonNumber, - EpisodeNumbers = episodesInFile.Select(e => e.EpisodeNumber).ToList(), - EpisodeFileId = file.Id, - ExistingPath = file.RelativePath, - NewPath = series.Path.GetRelativePath(newPath) - }; + { + SeriesId = series.Id, + SeasonNumber = seasonNumber, + EpisodeNumbers = episodesInFile.Select(e => e.EpisodeNumber).ToList(), + EpisodeFileId = file.Id, + ExistingPath = file.RelativePath, + NewPath = series.Path.GetRelativePath(newPath) + }; } } } @@ -132,7 +132,7 @@ namespace NzbDrone.Core.MediaFiles } catch (Exception ex) { - _logger.Error(ex, "Failed to rename file: " + episodeFilePath); + _logger.Error(ex, "Failed to rename file {0}", episodeFilePath); } } diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs index ecb96d9be..15843ef7b 100644 --- a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs +++ b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs @@ -38,22 +38,22 @@ namespace NzbDrone.Core.Messaging.Commands { try { - ExecuteCommand((dynamic) command.Body, command); + ExecuteCommand((dynamic)command.Body, command); } catch (Exception ex) { - _logger.Error(ex, "Error occurred while executing task " + command.Name); + _logger.Error(ex, "Error occurred while executing task {0}", command.Name); } } } catch (ThreadAbortException ex) { - _logger.Error(ex, "Thread aborted: " + ex.Message); + _logger.Error(ex); Thread.ResetAbort(); } catch (Exception ex) { - _logger.Error(ex, "Unknown error in thread: " + ex.Message); + _logger.Error(ex, "Unknown error in thread"); } } @@ -104,7 +104,7 @@ namespace NzbDrone.Core.Messaging.Commands _logger.Trace("{0} <- {1} [{2}]", command.GetType().Name, handler.GetType().Name, commandModel.Duration.ToString()); } - + private void BroadcastCommandUpdate(CommandModel command) { if (command.Body.SendUpdatesToClient) diff --git a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs index 2ab68ceca..a66d22c2c 100644 --- a/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs +++ b/src/NzbDrone.Core/Messaging/Events/EventAggregator.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Messaging.Events _taskFactory = new TaskFactory(); } - public void PublishEvent(TEvent @event) where TEvent : class ,IEvent + public void PublishEvent(TEvent @event) where TEvent : class, IEvent { Ensure.That(@event, () => @event).IsNotNull(); @@ -58,7 +58,7 @@ namespace NzbDrone.Core.Messaging.Events } catch (Exception e) { - _logger.Error(e, string.Format("{0} failed while processing [{1}]", handler.GetType().Name, eventName)); + _logger.Error(e, "{0} failed while processing [{1}]", handler.GetType().Name, eventName); } } diff --git a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs index 86738fbcc..61cd7e663 100644 --- a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs +++ b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarProxy.cs @@ -52,16 +52,16 @@ namespace NzbDrone.Core.Notifications.Boxcar { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "Access Token is invalid: " + ex.Message); + _logger.Error(ex, "Access Token is invalid"); return new ValidationFailure("Token", "Access Token is invalid"); } - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Token", "Unable to send test message"); } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("", "Unable to send test message"); } } @@ -84,7 +84,7 @@ namespace NzbDrone.Core.Notifications.Boxcar { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "Access Token is invalid: " + ex.Message); + _logger.Error(ex, "Access Token is invalid"); throw; } diff --git a/src/NzbDrone.Core/Notifications/Email/EmailService.cs b/src/NzbDrone.Core/Notifications/Email/EmailService.cs index f1469d2e9..2599e5de4 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailService.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailService.cs @@ -68,7 +68,7 @@ namespace NzbDrone.Core.Notifications.Email } catch (Exception ex) { - _logger.Error(ex, "Unable to send test email: " + ex.Message); + _logger.Error(ex, "Unable to send test email"); return new ValidationFailure("Server", "Unable to send test email"); } diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index 73f6bc3b5..e4d6c3d08 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -152,7 +152,7 @@ namespace NzbDrone.Core.Notifications.Growl } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Host", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs index 13451c912..548fe6bde 100644 --- a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs +++ b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Notifications.Join catch (JoinException ex) { _logger.Error(ex, "Unable to send Join message."); - throw ex; + throw; } } diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs index d133687d7..c1280c309 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs @@ -52,7 +52,7 @@ namespace NzbDrone.Core.Notifications.Emby } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Host", "Unable to send test message: " + ex.Message); } diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index 6ae201fb2..985126f19 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -42,7 +42,7 @@ namespace NzbDrone.Core.Notifications qualityString += " Proper"; } } - + if (series.SeriesType == SeriesTypes.Daily) { var episode = episodes.First(); @@ -69,7 +69,7 @@ namespace NzbDrone.Core.Notifications private bool ShouldHandleSeries(ProviderDefinition definition, Series series) { - var notificationDefinition = (NotificationDefinition) definition; + var notificationDefinition = (NotificationDefinition)definition; if (notificationDefinition.Tags.Empty()) { @@ -90,7 +90,8 @@ namespace NzbDrone.Core.Notifications public void Handle(EpisodeGrabbedEvent message) { - var grabMessage = new GrabMessage { + var grabMessage = new GrabMessage + { Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.ParsedEpisodeInfo.Quality), Series = message.Episode.Series, Quality = message.Episode.ParsedEpisodeInfo.Quality, @@ -107,7 +108,7 @@ namespace NzbDrone.Core.Notifications catch (Exception ex) { - _logger.Error(ex, "Unable to send OnGrab notification to: " + notification.Definition.Name); + _logger.Error(ex, "Unable to send OnGrab notification to {0}", notification.Definition.Name); } } } diff --git a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroidProxy.cs b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroidProxy.cs index ce4d97790..070cf1591 100644 --- a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroidProxy.cs +++ b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroidProxy.cs @@ -75,7 +75,7 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("ApiKey", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexClientService.cs b/src/NzbDrone.Core/Notifications/Plex/PlexClientService.cs index 76a6a6a0d..476b9d27d 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexClientService.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexClientService.cs @@ -63,7 +63,7 @@ namespace NzbDrone.Core.Notifications.Plex } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Host", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs index 727c63e35..891815529 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs @@ -175,12 +175,12 @@ namespace NzbDrone.Core.Notifications.Plex } catch(PlexAuthenticationException ex) { - _logger.Error(ex, "Unable to connect to Plex Server: " + ex.Message); + _logger.Error(ex, "Unable to connect to Plex Server"); return new ValidationFailure("Username", "Incorrect username or password"); } catch (Exception ex) { - _logger.Error(ex, "Unable to connect to Plex Server: " + ex.Message); + _logger.Error(ex, "Unable to connect to Plex Server"); return new ValidationFailure("Host", "Unable to connect to Plex Server"); } diff --git a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs index bf56dbad3..7b70a8b6e 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs @@ -94,7 +94,7 @@ namespace NzbDrone.Core.Notifications.Prowl } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("ApiKey", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs index 753a95d2b..497d8e7f0 100644 --- a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs +++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletProxy.cs @@ -42,7 +42,7 @@ namespace NzbDrone.Core.Notifications.PushBullet } catch (PushBulletException ex) { - _logger.Error(ex, "Unable to send test message to: " + channelTag); + _logger.Error(ex, "Unable to send test message to {0}", channelTag); error = true; } } @@ -61,7 +61,7 @@ namespace NzbDrone.Core.Notifications.PushBullet } catch (PushBulletException ex) { - _logger.Error(ex, "Unable to send test message to: " + deviceId); + _logger.Error(ex, "Unable to send test message to {0}", deviceId); error = true; } } @@ -101,16 +101,16 @@ namespace NzbDrone.Core.Notifications.PushBullet { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "API Key is invalid: " + ex.Message); + _logger.Error(ex, "API Key is invalid"); return new ValidationFailure("ApiKey", "API Key is invalid"); } - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("ApiKey", "Unable to send test message"); } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("", "Unable to send test message"); } @@ -165,7 +165,7 @@ namespace NzbDrone.Core.Notifications.PushBullet { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "API Key is invalid: " + ex.Message); + _logger.Error(ex, "API Key is invalid"); throw; } diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs index 97b3215d8..574441e65 100644 --- a/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs @@ -73,30 +73,30 @@ namespace NzbDrone.Core.Notifications.Pushalot { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "Authentication Token is invalid: " + ex.Message); + _logger.Error(ex, "Authentication Token is invalid"); return new ValidationFailure("AuthToken", "Authentication Token is invalid"); } if (ex.Response.StatusCode == HttpStatusCode.NotAcceptable) { - _logger.Error(ex, "Message limit reached: " + ex.Message); + _logger.Error(ex, "Message limit reached"); return new ValidationFailure("AuthToken", "Message limit reached"); } if (ex.Response.StatusCode == HttpStatusCode.Gone) { - _logger.Error(ex, "Authorization Token is no longer valid: " + ex.Message); + _logger.Error(ex, "Authorization Token is no longer valid"); return new ValidationFailure("AuthToken", "Authorization Token is no longer valid, please use a new one."); } var response = Json.Deserialize(ex.Response.Content); - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("AuthToken", response.Description); } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/Pushover/PushoverService.cs b/src/NzbDrone.Core/Notifications/Pushover/PushoverService.cs index 940ab9ffd..63684f012 100644 --- a/src/NzbDrone.Core/Notifications/Pushover/PushoverService.cs +++ b/src/NzbDrone.Core/Notifications/Pushover/PushoverService.cs @@ -59,7 +59,7 @@ namespace NzbDrone.Core.Notifications.Pushover } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("ApiKey", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs b/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs index e7259d753..a0cb33a82 100644 --- a/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs +++ b/src/NzbDrone.Core/Notifications/Telegram/TelegramService.cs @@ -51,7 +51,7 @@ namespace NzbDrone.Core.Notifications.Telegram } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); var restException = ex as RestException; diff --git a/src/NzbDrone.Core/Notifications/Twitter/TwitterService.cs b/src/NzbDrone.Core/Notifications/Twitter/TwitterService.cs index 6c894b228..cf3c687fa 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/TwitterService.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterService.cs @@ -131,7 +131,7 @@ namespace NzbDrone.Core.Notifications.Twitter } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Host", "Unable to send test message"); } return null; diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs index 84127f69f..d9cacf8f8 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs @@ -115,7 +115,7 @@ namespace NzbDrone.Core.Notifications.Xbmc } catch (Exception ex) { - _logger.Error(ex, "Unable to send test message: " + ex.Message); + _logger.Error(ex, "Unable to send test message"); return new ValidationFailure("Host", "Unable to send test message"); } diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index df9b19679..e40501e8b 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -401,7 +401,7 @@ namespace NzbDrone.Core.Parser catch (Exception e) { if (!title.ToLower().Contains("password") && !title.ToLower().Contains("yenc")) - Logger.Error(e, "An error has occurred while trying to parse " + title); + Logger.Error(e, "An error has occurred while trying to parse {0}", title); } Logger.Debug("Unable to parse {0}", title); @@ -500,7 +500,7 @@ namespace NzbDrone.Core.Parser return title; } - + private static SeriesTitleInfo GetSeriesTitleInfo(string title) { var seriesTitleInfo = new SeriesTitleInfo(); diff --git a/src/NzbDrone.Core/RootFolders/RootFolderService.cs b/src/NzbDrone.Core/RootFolders/RootFolderService.cs index f1a1145e9..851dddc8f 100644 --- a/src/NzbDrone.Core/RootFolders/RootFolderService.cs +++ b/src/NzbDrone.Core/RootFolders/RootFolderService.cs @@ -78,7 +78,7 @@ namespace NzbDrone.Core.RootFolders //We don't want an exception to prevent the root folders from loading in the UI, so they can still be deleted catch (Exception ex) { - _logger.Error(ex, "Unable to get free space and unmapped folders for root folder: " + folder.Path); + _logger.Error(ex, "Unable to get free space and unmapped folders for root folder {0}", folder.Path); folder.FreeSpace = 0; folder.UnmappedFolders = new List(); } diff --git a/src/NzbDrone.Core/Tv/MoveSeriesService.cs b/src/NzbDrone.Core/Tv/MoveSeriesService.cs index 30abcb487..a6ffb0578 100644 --- a/src/NzbDrone.Core/Tv/MoveSeriesService.cs +++ b/src/NzbDrone.Core/Tv/MoveSeriesService.cs @@ -53,9 +53,7 @@ namespace NzbDrone.Core.Tv } catch (IOException ex) { - var errorMessage = string.Format("Unable to move series from '{0}' to '{1}'", source, destination); - - _logger.Error(ex, errorMessage); + _logger.Error(ex, "Unable to move series from '{0}' to '{1}'", source, destination); throw; } diff --git a/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs b/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs index 5b4a07234..b81292219 100644 --- a/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs +++ b/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs @@ -77,7 +77,7 @@ namespace NzbDrone.Core.Tv } catch (Exception e) { - _logger.Fatal(e, "An error has occurred while updating episode info for series {0}. {1}", series, episode)); + _logger.Fatal(e, "An error has occurred while updating episode info for series {0}. {1}", series, episode); failCount++; } } diff --git a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs index c39deeffb..f177b5857 100644 --- a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs +++ b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs @@ -51,7 +51,7 @@ namespace NzbDrone.Core.Tv _logger.ProgressInfo("Updating Info for {0}", series.Title); Tuple> tuple; - + try { tuple = _seriesInfo.GetSeriesInfo(series.TvdbId); @@ -167,7 +167,7 @@ namespace NzbDrone.Core.Tv } catch (Exception e) { - _logger.Error(e, "Couldn't refresh info for {0}".Inject(series)); + _logger.Error(e, "Couldn't refresh info for {0}", series); } } @@ -180,7 +180,7 @@ namespace NzbDrone.Core.Tv } catch (Exception e) { - _logger.Error(e, "Couldn't rescan series {0}".Inject(series)); + _logger.Error(e, "Couldn't rescan series {0}", series); } } } diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs index e5ef7fa30..c4b345fcc 100644 --- a/src/NzbDrone.Core/Update/InstallUpdateService.cs +++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs @@ -148,7 +148,7 @@ namespace NzbDrone.Core.Update } catch (Exception e) { - _logger.Error(e, string.Format("Couldn't change the branch from [{0}] to [{1}].", currentBranch, package.Branch)); + _logger.Error(e, "Couldn't change the branch from [{0}] to [{1}].", currentBranch, package.Branch); } } } diff --git a/src/NzbDrone.Host/BrowserService.cs b/src/NzbDrone.Host/BrowserService.cs index 1867421cf..7ccf23b59 100644 --- a/src/NzbDrone.Host/BrowserService.cs +++ b/src/NzbDrone.Host/BrowserService.cs @@ -43,7 +43,7 @@ namespace NzbDrone.Host } catch (Exception e) { - _logger.Error(e, "Couldn't open default browser to " + url); + _logger.Error(e, "Couldn't open default browser to {0}", url); } } } diff --git a/src/NzbDrone.Host/PlatformValidation.cs b/src/NzbDrone.Host/PlatformValidation.cs index a4dce7bc8..ccd9ef145 100644 --- a/src/NzbDrone.Host/PlatformValidation.cs +++ b/src/NzbDrone.Host/PlatformValidation.cs @@ -9,7 +9,7 @@ namespace NzbDrone.Host { public static class PlatformValidation { - private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(PlatformValidation)); + private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(PlatformValidation)); private const string DOWNLOAD_LINK = "http://www.microsoft.com/en-us/download/details.aspx?id=42643"; @@ -49,7 +49,7 @@ namespace NzbDrone.Host } catch (Exception e) { - Logger.Warn("Couldn't load {0}", e.Message); + Logger.Warn(e, "Couldn't load {0}", assemblyString); return false; } diff --git a/src/NzbDrone.Mono/Disk/DiskProvider.cs b/src/NzbDrone.Mono/Disk/DiskProvider.cs index fc2a4e33d..d9f3cba29 100644 --- a/src/NzbDrone.Mono/Disk/DiskProvider.cs +++ b/src/NzbDrone.Mono/Disk/DiskProvider.cs @@ -54,7 +54,7 @@ namespace NzbDrone.Mono.Disk } catch (InvalidOperationException ex) { - Logger.Error(ex, "Couldn't get free space for " + path); + Logger.Error(ex, "Couldn't get free space for {0}", path); } return null; @@ -107,7 +107,7 @@ namespace NzbDrone.Mono.Disk } catch (InvalidOperationException e) { - Logger.Error(e, "Couldn't get total space for " + path); + Logger.Error(e, "Couldn't get total space for {0}", path); } return null; @@ -207,7 +207,7 @@ namespace NzbDrone.Mono.Disk return g.gr_gid; - + } } } diff --git a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs index 0a1bc9147..279ee8a56 100644 --- a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs +++ b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Update.UpdateEngine } catch (InvalidOperationException e) { - _logger.Warn("Couldn't start NzbDrone Service (Most likely due to permission issues). falling back to console.", e); + _logger.Warn(e, "Couldn't start NzbDrone Service (Most likely due to permission issues). falling back to console."); StartConsole(installationFolder); } } diff --git a/src/NzbDrone.sln.DotSettings b/src/NzbDrone.sln.DotSettings index 260cae878..1d351d0ce 100644 --- a/src/NzbDrone.sln.DotSettings +++ b/src/NzbDrone.sln.DotSettings @@ -4,10 +4,12 @@ DO_NOT_SHOW DO_NOT_SHOW DO_NOT_SHOW + ERROR ERROR ERROR DO_NOT_SHOW ERROR + ERROR HINT WARNING WARNING