mirror of
https://github.com/Sonarr/Sonarr
synced 2024-12-24 16:53:54 +00:00
fixed update again.
This commit is contained in:
parent
06f5ff7cb8
commit
2f20aeaec5
4 changed files with 13 additions and 9 deletions
|
@ -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()
|
||||
|
|
|
@ -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>();
|
||||
|
||||
|
|
|
@ -29,13 +29,13 @@ namespace NzbDrone.Update
|
|||
try
|
||||
{
|
||||
Console.WriteLine("Starting NzbDrone Update Client");
|
||||
|
||||
|
||||
IgnoreCertErrorPolicy.Register();
|
||||
|
||||
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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue