github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-21 14:03:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'autofac'

Browse source 
Conflicts:
	NzbDrone.Common/IISProvider.cs
	NzbDrone.Core/CentralDispatch.cs
This commit is contained in:
Mark McDowall 2013-01-06 01:14:52 -08:00
commit 1ef6906dc1
142 changed files with 552 additions and 627 deletions
Download patch file Download diff file Expand all files Collapse all files

8
NzbDrone.Update/NzbDrone.Update.csproj
View file

@ -37,9 +37,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>
<Reference Include="Autofac">
<HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Autofac.Configuration">
<HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>

21
NzbDrone.Update/Program.cs
View file

@ -1,8 +1,8 @@
using System;
using System.IO;
using System.Linq;
using Autofac;
using NLog;
using Ninject;
using NzbDrone.Common;
using NzbDrone.Update.Providers;
@ -12,7 +12,7 @@ namespace NzbDrone.Update
{
private readonly UpdateProvider _updateProvider;
private readonly ProcessProvider _processProvider;
private static StandardKernel _kernel;
private static IContainer _container;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
@ -27,13 +27,14 @@ namespace NzbDrone.Update
try
{
Console.WriteLine("Starting NzbDrone Update Client");
_kernel = new StandardKernel();
var builder = new ContainerBuilder();
builder.RegisterAssemblyTypes(typeof(UpdateProvider).Assembly).SingleInstance();
builder.RegisterAssemblyTypes(typeof(RestProvider).Assembly).SingleInstance();
_container = builder.Build();
InitLoggers();
logger.Info("Updating NzbDrone to version {0}", _kernel.Get<EnvironmentProvider>().Version);
_kernel.Get<Program>().Start(args);
logger.Info("Updating NzbDrone to version {0}", _container.Resolve<EnvironmentProvider>().Version);
_container.Resolve<Program>().Start(args);
}
catch (Exception e)
{
@ -48,8 +49,8 @@ namespace NzbDrone.Update
{
try
{
var environmentProvider = _kernel.Get<EnvironmentProvider>();
var diskProvider = _kernel.Get<DiskProvider>();
var environmentProvider = _container.Resolve<EnvironmentProvider>();
var diskProvider = _container.Resolve<DiskProvider>();
logger.Info("Copying log files to application directory.");
diskProvider.CopyDirectory(environmentProvider.GetSandboxLogFolder(), environmentProvider.GetUpdateLogFolder());
}
@ -61,7 +62,7 @@ namespace NzbDrone.Update
private static void InitLoggers()
{
ReportingService.RestProvider = _kernel.Get<RestProvider>();
ReportingService.RestProvider = _container.Resolve<RestProvider>();
ReportingService.SetupExceptronDriver();
LogConfiguration.RegisterRemote();

2
NzbDrone.Update/Providers/UpdateProvider.cs
View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using NLog;
using Ninject;
using NzbDrone.Common;
namespace NzbDrone.Update.Providers
@ -17,7 +16,6 @@ namespace NzbDrone.Update.Providers
private readonly IISProvider _iisProvider;
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
[Inject]
public UpdateProvider(DiskProvider diskProvider, ServiceProvider serviceProvider,
ProcessProvider processProvider, EnvironmentProvider environmentProvider, IISProvider iisProvider)
{

2
NzbDrone.Update/packages.config
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="Autofac" version="2.6.3.862" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" />
</packages>