Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-09-11 12:02:35 +02:00
Code Issues Releases Wiki Activity

Fixed: More Sentry Filtering

Browse Source
This commit is contained in:
Qstick 2019-09-26 21:41:52 -04:00
parent ae9c2dd830
commit f395117885
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NzbDrone.Common/Instrumentation/Extensions/LoggerExtensions.cs
View File

@ -1,5 +1,4 @@
using NLog;
using NLog.Fluent;
namespace NzbDrone.Common.Instrumentation.Extensions
{

2
src/NzbDrone.Common/Instrumentation/InitializeLogger.cs
View File

@ -25,4 +25,4 @@ public void Initialize()
}
}
}
}
}

3
src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
View File

@ -62,6 +62,7 @@ public static void Register(IStartupContext startupContext, bool updateApp, bool
private static void RegisterSentry(bool updateClient)
{
string dsn;
if (updateClient)
@ -82,7 +83,7 @@ private static void RegisterSentry(bool updateClient)
Layout = "${message}"
};
var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Warn, target);
var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Debug, target);
LogManager.Configuration.AddTarget("sentryTarget", target);
LogManager.Configuration.LoggingRules.Add(loggingRule);

22
src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
View File

@ -4,6 +4,7 @@
using System.Linq;
using System.Net;
using System.Threading;
using System.Data.SQLite;
using NLog;
using NLog.Common;
using NLog.Targets;
@ -17,6 +18,21 @@ namespace NzbDrone.Common.Instrumentation.Sentry
[Target("Sentry")]
public class SentryTarget : TargetWithLayout
{
// don't report uninformative SQLite exceptions
// busy/locked are benign https://forums.sonarr.tv/t/owin-sqlite-error-5-database-is-locked/5423/11
// The others will be user configuration problems and silt up Sentry
private static readonly HashSet<SQLiteErrorCode> FilteredSQLiteErrors = new HashSet<SQLiteErrorCode> {
SQLiteErrorCode.Busy,
SQLiteErrorCode.Locked,
SQLiteErrorCode.Perm,
SQLiteErrorCode.ReadOnly,
SQLiteErrorCode.IoErr,
SQLiteErrorCode.Corrupt,
SQLiteErrorCode.Full,
SQLiteErrorCode.CantOpen,
SQLiteErrorCode.Auth
};
// use string and not Type so we don't need a reference to the project
// where these are defined
private static readonly HashSet<string> FilteredExceptionTypeNames = new HashSet<string> {
@ -218,6 +234,12 @@ public bool IsSentryMessage(LogEventInfo logEvent)
{
if (FilterEvents)
{
var sqlEx = logEvent.Exception as SQLiteException;
if (sqlEx != null && FilteredSQLiteErrors.Contains(sqlEx.ResultCode))
{
return false;
}
if (FilteredExceptionTypeNames.Contains(logEvent.Exception.GetType().Name))
{
return false;

3
src/NzbDrone.Common/Radarr.Common.csproj
View File

@ -13,6 +13,9 @@
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Data.SQLite">
<HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.ServiceProcess" />
</ItemGroup>
<ItemGroup>

4
src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
View File

@ -208,8 +208,8 @@ private Rejection EvaluateSpec(IDecisionEngineSpecification spec, RemoteMovie re
{
e.Data.Add("report", remoteMovie.Release.ToJson());
e.Data.Add("parsed", remoteMovie.ParsedMovieInfo.ToJson());
_logger.Error(e, "Couldn't evaluate decision on " + remoteMovie.Release.Title + ", with spec: " + spec.GetType().Name);
return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message));//TODO UPDATE SPECS!
_logger.Error(e, "Couldn't evaluate decision on {0}, with spec: {1}", remoteMovie.Release.Title, spec.GetType().Name);
return new Rejection($"{spec.GetType().Name}: {e.Message}");
}
return null;