Merge branch 'master' of git://github.com/kayone/NzbDrone
This commit is contained in:
commit
9327ef4352
|
@ -108,6 +108,8 @@ namespace NzbDrone.Core
|
|||
InSingletonScope();
|
||||
_kernel.Bind<IRepository>().ToConstant(logRepository).WhenInjectedInto<LogProvider>().InSingletonScope();
|
||||
|
||||
LogConfiguration.Setup();
|
||||
|
||||
ForceMigration(_kernel.Get<IRepository>());
|
||||
SetupDefaultQualityProfiles(_kernel.Get<IRepository>()); //Setup the default QualityProfiles on start-up
|
||||
|
||||
|
@ -154,6 +156,7 @@ namespace NzbDrone.Core
|
|||
repository.All<EpisodeFile>().Count();
|
||||
repository.All<QualityProfile>().Count();
|
||||
repository.All<History>().Count();
|
||||
repository.All<IndexerSetting>().Count();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -28,8 +28,6 @@ namespace NzbDrone.Core.Instrumentation
|
|||
LogManager.Configuration.AddTarget("Exceptioneer", exTarget);
|
||||
LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Error, exTarget));
|
||||
#endif
|
||||
|
||||
|
||||
var sonicTarget = CentralDispatch.NinjectKernel.Get<SubsonicTarget>();
|
||||
LogManager.Configuration.AddTarget("DbLogger", sonicTarget);
|
||||
LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Info, sonicTarget));
|
||||
|
|
|
@ -36,7 +36,6 @@ namespace NzbDrone.Web
|
|||
{
|
||||
base.OnApplicationStarted();
|
||||
|
||||
LogConfiguration.Setup();
|
||||
Logger.Info("NZBDrone Starting up.");
|
||||
CentralDispatch.DedicateToHost();
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@
|
|||
</system.data>
|
||||
<glimpse on="true" saveRequestCount="5">
|
||||
<ipAddresses>
|
||||
<add address="127.0.0.1" />
|
||||
<add address="0.0.0.0" />
|
||||
<!--IPv4-->
|
||||
<add address="::1" />
|
||||
<!--IPv6-->
|
||||
|
|
|
@ -27,6 +27,7 @@ Global
|
|||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D12F7F2F-8A3C-415F-88FA-6DD061A84869}.Debug|x86.Build.0 = Debug|x86
|
||||
|
|
Loading…
Reference in New Issue