mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/kayone/NzbDrone

This commit is contained in:
Mark McDowall 2011-05-17 21:29:09 -07:00
parent 8e214029c9 30d8da3ce8
commit 9327ef4352
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NzbDrone.Core/CentralDispatch.cs
View File

@ -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>

2
NzbDrone.Core/Instrumentation/LogConfiguration.cs
View File

@ -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));

1
NzbDrone.Web/Global.asax.cs
View File

@ -36,7 +36,6 @@ namespace NzbDrone.Web
{
base.OnApplicationStarted();
LogConfiguration.Setup();
Logger.Info("NZBDrone Starting up.");
CentralDispatch.DedicateToHost();

2
NzbDrone.Web/Web.config
View File

@ -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-->

1
NzbDrone.sln
View File

@ -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