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

fixed update again.

This commit is contained in:
kay.one 2013-08-15 20:32:23 -07:00
parent 06f5ff7cb8
commit 2f20aeaec5
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NzbDrone.Common/Composition/ContainerBuilderBase.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging;
using TinyIoC;
@ -14,8 +15,10 @@ namespace NzbDrone.Common.Composition
public IContainer Container { get; private set; }
protected ContainerBuilderBase(params string[] assemblies)
protected ContainerBuilderBase(IStartupArguments args, params string[] assemblies)
{
_loadedTypes = new List<Type>();
foreach (var assembly in assemblies)
@ -25,6 +28,7 @@ namespace NzbDrone.Common.Composition
Container = new Container(new TinyIoCContainer(), _loadedTypes);
AutoRegisterInterfaces();
Container.Register(args);
}
private void AutoRegisterInterfaces()

3
NzbDrone.Host/MainAppContainerBuilder.cs
View File

@ -17,9 +17,8 @@ namespace NzbDrone.Host
}
private MainAppContainerBuilder(StartupArguments args)
: base("NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api")
: base(args, "NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api")
{
Container.Register<IStartupArguments>(args);
AutoRegisterImplementations<NzbDronePersistentConnection>();

2
NzbDrone.Update/UpdateApp.cs
View File

@ -35,7 +35,7 @@ namespace NzbDrone.Update
GlobalExceptionHandlers.Register();
new LogglyTarget().Register(LogLevel.Trace);
_container = UpdateContainerBuilder.Build();
_container = UpdateContainerBuilder.Build(new StartupArguments(args));
logger.Info("Updating NzbDrone to version {0}", BuildInfo.Version);
_container.Resolve<UpdateApp>().Start(args);

9
NzbDrone.Update/UpdateContainerBuilder.cs
View File

@ -1,18 +1,19 @@
using NzbDrone.Common.Composition;
using NzbDrone.Common.EnvironmentInfo;
namespace NzbDrone.Update
{
public class UpdateContainerBuilder : ContainerBuilderBase
{
private UpdateContainerBuilder()
: base("NzbDrone.Update", "NzbDrone.Common")
private UpdateContainerBuilder(IStartupArguments startupArguments)
: base(startupArguments, "NzbDrone.Update", "NzbDrone.Common")
{
}
public static IContainer Build()
public static IContainer Build(IStartupArguments startupArguments)
{
return new UpdateContainerBuilder().Container;
return new UpdateContainerBuilder(startupArguments).Container;
}
}
}