From b6cf96b7370e22813d5647afe8323df05d543357 Mon Sep 17 00:00:00 2001 From: TCBWZA Date: Sat, 8 Apr 2017 23:47:59 +0200 Subject: [PATCH] Changes to remove sentry submissions and refrences to sonarr.tv --- .../Calendar/CalendarFeedModule.cs | 4 +- .../Instrumentation/NzbDroneLogger.cs | 58 ++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs index 05d34716e..4e89eb44d 100644 --- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs +++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs @@ -89,6 +89,8 @@ namespace NzbDrone.Api.Calendar var episodes = _episodeService.EpisodesBetweenDates(start, end, unmonitored); var calendar = new Ical.Net.Calendar { + // This will need to point to the hosted web site + // TODO ProductId = "-//Lidarr.tv//Lidarr//EN" }; @@ -107,7 +109,7 @@ namespace NzbDrone.Api.Calendar } var occurrence = calendar.Create(); - occurrence.Uid = "NzbDrone_episode_" + episode.Id; + occurrence.Uid = "NzbDrone_album_" + episode.Id; occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative; occurrence.Description = episode.Overview; occurrence.Categories = new List() { episode.Series.Network }; diff --git a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs index 133a3859e..d0b0f4f47 100644 --- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs +++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs @@ -40,7 +40,9 @@ namespace NzbDrone.Common.Instrumentation RegisterDebugger(); } - RegisterSentry(updateApp); + // Need to register for Sentry service (sonarr) + // Exceptron is being considered by Radarr + // RegisterSentry(updateApp); if (updateApp) { @@ -87,34 +89,34 @@ namespace NzbDrone.Common.Instrumentation private static void RegisterSentry(bool updateClient) { - string dsn; - - if (updateClient) - { - dsn = RuntimeInfo.IsProduction - ? "https://b85aa82c65b84b0e99e3b7c281438357:392b5bc007974147a922c5d841c47cf9@sentry.Lidarr.tv/11" - : "https://6168f0946aba4e60ac23e469ac08eac5:bd59e8454ccc454ea27a90cff1f814ca@sentry.Lidarr.tv/9"; - - } - else - { - dsn = RuntimeInfo.IsProduction - ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.Lidarr.tv/8" - : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.Lidarr.tv/10"; - } - - var target = new SentryTarget(dsn) - { - Name = "sentryTarget", - Layout = "${message}" - }; - - var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Error, target); - LogManager.Configuration.AddTarget("sentryTarget", target); - LogManager.Configuration.LoggingRules.Add(loggingRule); - } + // string dsn; + + // if (updateClient) + // { + // dsn = RuntimeInfo.IsProduction + // ? "https://b85aa82c65b84b0e99e3b7c281438357:392b5bc007974147a922c5d841c47cf9@sentry.Lidarr.tv/11" + // : "https://6168f0946aba4e60ac23e469ac08eac5:bd59e8454ccc454ea27a90cff1f814ca@sentry.Lidarr.tv/9"; + + // } + // else + // { + // dsn = RuntimeInfo.IsProduction + // ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.Lidarr.tv/8" + // : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.Lidarr.tv/10"; + // } + + // var target = new SentryTarget(dsn) + // { + // Name = "sentryTarget", + // Layout = "${message}" + // }; + + // var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Error, target); + // LogManager.Configuration.AddTarget("sentryTarget", target); + // LogManager.Configuration.LoggingRules.Add(loggingRule); + } - private static void RegisterDebugger() + private static void RegisterDebugger() { DebuggerTarget target = new DebuggerTarget(); target.Name = "debuggerLogger";