Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable Sentry Reporting based on analytics flag

This commit is contained in:
Keivan Beigi 2017-01-04 17:56:29 -08:00
parent a1f112e62f
commit dd7fdd8ace
7 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Api/TinyIoCNancyBootstrapper.cs
View File

@ -22,7 +22,7 @@ namespace NzbDrone.Api
/// </summary>
public static IEnumerable<Func<Assembly, bool>> DefaultAutoRegisterIgnoredAssemblies = new Func<Assembly, bool>[]
{
asm => !asm.FullName.StartsWith("Nancy.", StringComparison.InvariantCulture),
asm => !asm.FullName.StartsWith("Nancy.", StringComparison.InvariantCulture)
};
/// <summary>

1
src/NzbDrone.Common/Composition/ContainerBuilderBase.cs
View File

@ -6,7 +6,6 @@ using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging;
using TinyIoC;
namespace NzbDrone.Common.Composition
{
public abstract class ContainerBuilderBase

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

@ -59,6 +59,12 @@ namespace NzbDrone.Common.Instrumentation
LogManager.ReconfigExistingLoggers();
}
public static void UnRegisterRemoteLoggers()
{
LogManager.Configuration.RemoveTarget("sentryTarget");
LogManager.ReconfigExistingLoggers();
}
private static void RegisterLogEntries()
{
var target = new LogentriesTarget();
@ -112,7 +118,6 @@ namespace NzbDrone.Common.Instrumentation
LogManager.Configuration.LoggingRules.Add(loggingRule);
}
private static void RegisterConsole()
{
var level = LogLevel.Trace;
@ -128,7 +133,7 @@ namespace NzbDrone.Common.Instrumentation
LogManager.Configuration.LoggingRules.Add(loggingRule);
}
const string FILE_LOG_LAYOUT = @"${date:format=yy-M-d HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}";
private const string FILE_LOG_LAYOUT = @"${date:format=yy-M-d HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}";
private static void RegisterAppFile(IAppFolderInfo appFolderInfo)
{
@ -137,7 +142,7 @@ namespace NzbDrone.Common.Instrumentation
RegisterAppFile(appFolderInfo, "appFileTrace", "sonarr.trace.txt", 50, LogLevel.Off);
}
private static LoggingRule RegisterAppFile(IAppFolderInfo appFolderInfo, string name, string fileName, int maxArchiveFiles, LogLevel minLogLevel)
private static void RegisterAppFile(IAppFolderInfo appFolderInfo, string name, string fileName, int maxArchiveFiles, LogLevel minLogLevel)
{
var fileTarget = new NzbDroneFileTarget();
@ -158,8 +163,6 @@ namespace NzbDrone.Common.Instrumentation
LogManager.Configuration.AddTarget(name, fileTarget);
LogManager.Configuration.LoggingRules.Add(loggingRule);
return loggingRule;
}
private static void RegisterUpdateFile(IAppFolderInfo appFolderInfo)

2
src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs → src/NzbDrone.Core.Test/Instrumentation/DatabaseTargetFixture.cs
View File

@ -12,7 +12,7 @@ using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
using NzbDrone.Test.Common.Categories;
namespace NzbDrone.Core.Test.InstrumentationTests
namespace NzbDrone.Core.Test.Instrumentation
{
[TestFixture]
public class DatabaseTargetFixture : DbTest<DatabaseTarget, Log>

3
src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View File

@ -265,7 +265,7 @@
<Compile Include="IndexerTests\TorrentRssIndexerTests\TestTorrentRssIndexer.cs" />
<Compile Include="IndexerTests\WomblesTests\WomblesFixture.cs" />
<Compile Include="IndexerTests\XElementExtensionsFixture.cs" />
<Compile Include="InstrumentationTests\DatabaseTargetFixture.cs" />
<Compile Include="Instrumentation\DatabaseTargetFixture.cs" />
<Compile Include="JobTests\JobRepositoryFixture.cs" />
<Compile Include="JobTests\TestJobs.cs" />
<Compile Include="MediaCoverTests\CoverExistsSpecificationFixture.cs" />
@ -570,6 +570,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="InstrumentationTests\" />
<Folder Include="ProviderTests\UpdateProviderTests\" />
</ItemGroup>
<ItemGroup>

10
src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
View File

@ -9,6 +9,7 @@ using NzbDrone.Common.Cache;
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Core.Authentication;
using NzbDrone.Core.Configuration.Events;
using NzbDrone.Core.Lifecycle;
@ -154,7 +155,7 @@ namespace NzbDrone.Core.Configuration
SetValue("AuthenticationMethod", AuthenticationType.Basic);
return AuthenticationType.Basic;
}
return GetValueEnum("AuthenticationMethod", AuthenticationType.None);
}
}
@ -188,7 +189,7 @@ namespace NzbDrone.Core.Configuration
public UpdateMechanism UpdateMechanism => GetValueEnum("UpdateMechanism", UpdateMechanism.BuiltIn, false);
public string UpdateScriptPath => GetValue("UpdateScriptPath", "", false );
public string UpdateScriptPath => GetValue("UpdateScriptPath", "", false);
public int GetValueInt(string key, int defaultValue)
{
@ -344,6 +345,11 @@ namespace NzbDrone.Core.Configuration
{
EnsureDefaultConfigFile();
DeleteOldValues();
if (!AnalyticsEnabled)
{
NzbDroneLogger.UnRegisterRemoteLoggers();
}
}
public void Execute(ResetApiKeyCommand message)

6
src/NzbDrone.Update/UpdateApp.cs
View File

@ -33,12 +33,12 @@ namespace NzbDrone.Update
SecurityProtocolPolicy.Register();
X509CertificateValidationPolicy.Register();
var startupArgument = new StartupContext(args);
NzbDroneLogger.Register(startupArgument, true, true);
var startupContext = new StartupContext(args);
NzbDroneLogger.Register(startupContext, true, true);
Logger.Info("Starting Sonarr Update Client");
_container = UpdateContainerBuilder.Build(startupArgument);
_container = UpdateContainerBuilder.Build(startupContext);
_container.Resolve<UpdateApp>().Start(args);