From e4985cbd664d83e48fac6dd42f5aa52cffbc86f2 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 4 Jan 2012 11:24:17 -0800 Subject: [PATCH] Moved try/catch for failed refresh episode info to job. --- NzbDrone.Core/Jobs/UpdateInfoJob.cs | 22 +++++++++++++++++----- NzbDrone.Core/Providers/EpisodeProvider.cs | 11 ++--------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/NzbDrone.Core/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Jobs/UpdateInfoJob.cs index 5b3a7de6a..bd63cf978 100644 --- a/NzbDrone.Core/Jobs/UpdateInfoJob.cs +++ b/NzbDrone.Core/Jobs/UpdateInfoJob.cs @@ -1,5 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; +using NLog; using Ninject; using NzbDrone.Core.Helpers; using NzbDrone.Core.Model.Notification; @@ -13,6 +15,7 @@ namespace NzbDrone.Core.Jobs private readonly SeriesProvider _seriesProvider; private readonly EpisodeProvider _episodeProvider; private readonly ReferenceDataProvider _referenceDataProvider; + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); [Inject] public UpdateInfoJob(SeriesProvider seriesProvider, EpisodeProvider episodeProvider, @@ -55,10 +58,19 @@ namespace NzbDrone.Core.Jobs foreach (var series in seriesToUpdate) { - notification.CurrentMessage = "Updating " + series.Title; - _seriesProvider.UpdateSeriesInfo(series.SeriesId); - _episodeProvider.RefreshEpisodeInfo(series); - notification.CurrentMessage = "Update completed for " + series.Title; + try + { + notification.CurrentMessage = "Updating " + series.Title; + _seriesProvider.UpdateSeriesInfo(series.SeriesId); + _episodeProvider.RefreshEpisodeInfo(series); + notification.CurrentMessage = "Update completed for " + series.Title; + } + + catch(Exception ex) + { + Logger.ErrorException("Failed to update episode info for series: " + series.Title, ex); + } + } } } diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs index ea26976a0..de92c10f7 100644 --- a/NzbDrone.Core/Providers/EpisodeProvider.cs +++ b/NzbDrone.Core/Providers/EpisodeProvider.cs @@ -321,15 +321,8 @@ namespace NzbDrone.Core.Providers } } - try - { - _database.InsertMany(newList); - _database.UpdateMany(updateList); - } - catch(Exception ex) - { - Logger.WarnException("Failed to update episode info for series: " + series.Title, ex); - } + _database.InsertMany(newList); + _database.UpdateMany(updateList); Logger.Info("Finished episode refresh for series: {0}. Successful: {1} - Failed: {2} ", tvDbSeriesInfo.SeriesName, successCount, failCount);