applicationmode cleanup.

pull/40/head
kayone 11 years ago
parent c219be8c8d
commit 1e6817220a

@ -18,7 +18,7 @@ namespace NzbDrone.App.Test
[TestFixture] [TestFixture]
public class ContainerFixture : TestBase public class ContainerFixture : TestBase
{ {
StartupArguments args = new StartupArguments("first", "second"); StartupContext args = new StartupContext("first", "second");
[Test] [Test]
public void should_be_able_to_resolve_indexers() public void should_be_able_to_resolve_indexers()

@ -68,7 +68,7 @@ namespace NzbDrone.App.Test
serviceProvider.Setup(c => c.ServiceExist(It.IsAny<string>())).Returns(true); serviceProvider.Setup(c => c.ServiceExist(It.IsAny<string>())).Returns(true);
serviceProvider.Setup(c => c.GetStatus(It.IsAny<string>())).Returns(ServiceControllerStatus.StartPending); serviceProvider.Setup(c => c.GetStatus(It.IsAny<string>())).Returns(ServiceControllerStatus.StartPending);
Subject.Route(); Subject.Route(ApplicationModes.Service);
serviceProvider.Verify(c => c.Run(It.IsAny<ServiceBase>()), Times.Once()); serviceProvider.Verify(c => c.Run(It.IsAny<ServiceBase>()), Times.Once());
} }

@ -23,7 +23,7 @@ namespace NzbDrone.Automation.Test
public AutomationTest() public AutomationTest()
{ {
new StartupArguments(); new StartupContext();
LogManager.Configuration = new LoggingConfiguration(); LogManager.Configuration = new LoggingConfiguration();
var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" }; var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" };

@ -35,9 +35,9 @@ namespace NzbDrone.Common.Test
[Test] [Test]
public void should_use_path_from_arg_if_provided() public void should_use_path_from_arg_if_provided()
{ {
var args = new StartupArguments("-data=\"c:\\users\\test\\\""); var args = new StartupContext("-data=\"c:\\users\\test\\\"");
Mocker.SetConstant<IStartupArguments>(args); Mocker.SetConstant<IStartupContext>(args);
Subject.AppDataFolder.Should().Be("c:\\users\\test\\"); Subject.AppDataFolder.Should().Be("c:\\users\\test\\");
} }
} }

@ -11,7 +11,7 @@ namespace NzbDrone.Common.Test.EnvironmentTests
[Test] [Test]
public void empty_array_should_return_empty_flags() public void empty_array_should_return_empty_flags()
{ {
var args = new StartupArguments(new string[0]); var args = new StartupContext(new string[0]);
args.Flags.Should().BeEmpty(); args.Flags.Should().BeEmpty();
} }
@ -21,7 +21,7 @@ namespace NzbDrone.Common.Test.EnvironmentTests
[TestCase(" /t ")] [TestCase(" /t ")]
public void should_parse_single_flag(string arg) public void should_parse_single_flag(string arg)
{ {
var args = new StartupArguments(new[] { arg }); var args = new StartupContext(new[] { arg });
args.Flags.Should().HaveCount(1); args.Flags.Should().HaveCount(1);
args.Flags.Contains("t").Should().BeTrue(); args.Flags.Contains("t").Should().BeTrue();
} }
@ -32,7 +32,7 @@ namespace NzbDrone.Common.Test.EnvironmentTests
[TestCase(" /key=\"value\"")] [TestCase(" /key=\"value\"")]
public void should_parse_args_with_alues(string arg) public void should_parse_args_with_alues(string arg)
{ {
var args = new StartupArguments(new[] { arg }); var args = new StartupContext(new[] { arg });
args.Args.Should().HaveCount(1); args.Args.Should().HaveCount(1);
args.Args["key"].Should().Be("value"); args.Args["key"].Should().Be("value");
} }

@ -15,7 +15,7 @@ namespace NzbDrone.Common.Test
[SetUp] [SetUp]
public void setup() public void setup()
{ {
Mocker.SetConstant(MainAppContainerBuilder.BuildContainer(new StartupArguments())); Mocker.SetConstant(MainAppContainerBuilder.BuildContainer(new StartupContext()));
} }
[Test] [Test]

@ -15,7 +15,7 @@ namespace NzbDrone.Common.Composition
public IContainer Container { get; private set; } public IContainer Container { get; private set; }
protected ContainerBuilderBase(IStartupArguments args, params string[] assemblies) protected ContainerBuilderBase(IStartupContext args, params string[] assemblies)
{ {

@ -22,7 +22,7 @@ namespace NzbDrone.Common.EnvironmentInfo
private readonly Environment.SpecialFolder DATA_SPECIAL_FOLDER = Environment.SpecialFolder.CommonApplicationData; private readonly Environment.SpecialFolder DATA_SPECIAL_FOLDER = Environment.SpecialFolder.CommonApplicationData;
public AppFolderInfo(IDiskProvider diskProvider, IStartupArguments startupArguments) public AppFolderInfo(IDiskProvider diskProvider, IStartupContext startupContext)
{ {
_diskProvider = diskProvider; _diskProvider = diskProvider;
@ -33,9 +33,9 @@ namespace NzbDrone.Common.EnvironmentInfo
_logger = NzbDroneLogger.GetLogger(this); _logger = NzbDroneLogger.GetLogger(this);
if (startupArguments.Args.ContainsKey(StartupArguments.APPDATA)) if (startupContext.Args.ContainsKey(StartupContext.APPDATA))
{ {
AppDataFolder = startupArguments.Args[StartupArguments.APPDATA]; AppDataFolder = startupContext.Args[StartupContext.APPDATA];
} }
else else
{ {

@ -2,6 +2,7 @@
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Security.Principal; using System.Security.Principal;
using System.ServiceProcess;
using NLog; using NLog;
namespace NzbDrone.Common.EnvironmentInfo namespace NzbDrone.Common.EnvironmentInfo
@ -11,15 +12,21 @@ namespace NzbDrone.Common.EnvironmentInfo
{ {
bool IsUserInteractive { get; } bool IsUserInteractive { get; }
bool IsAdmin { get; } bool IsAdmin { get; }
bool IsWindowsService { get; }
} }
public class RuntimeInfo : IRuntimeInfo public class RuntimeInfo : IRuntimeInfo
{ {
private readonly Logger _logger; private readonly Logger _logger;
public RuntimeInfo(Logger logger) public RuntimeInfo(Logger logger, IServiceProvider serviceProvider)
{ {
_logger = logger; _logger = logger;
IsWindowsService = !IsUserInteractive &&
OsInfo.IsWindows &&
serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) &&
serviceProvider.GetStatus(ServiceProvider.NZBDRONE_SERVICE_NAME) == ServiceControllerStatus.StartPending;
} }
public bool IsUserInteractive public bool IsUserInteractive
@ -30,6 +37,8 @@ namespace NzbDrone.Common.EnvironmentInfo
static RuntimeInfo() static RuntimeInfo()
{ {
IsProduction = InternalIsProduction(); IsProduction = InternalIsProduction();
} }
public bool IsAdmin public bool IsAdmin
@ -49,6 +58,8 @@ namespace NzbDrone.Common.EnvironmentInfo
} }
} }
public bool IsWindowsService { get; private set; }
private static readonly string ProcessName = Process.GetCurrentProcess().ProcessName.ToLower(); private static readonly string ProcessName = Process.GetCurrentProcess().ProcessName.ToLower();
public static bool IsProduction { get; private set; } public static bool IsProduction { get; private set; }

@ -2,7 +2,7 @@
namespace NzbDrone.Common.EnvironmentInfo namespace NzbDrone.Common.EnvironmentInfo
{ {
public interface IStartupArguments public interface IStartupContext
{ {
HashSet<string> Flags { get; } HashSet<string> Flags { get; }
Dictionary<string, string> Args { get; } Dictionary<string, string> Args { get; }
@ -10,7 +10,7 @@ namespace NzbDrone.Common.EnvironmentInfo
bool UninstallService { get; } bool UninstallService { get; }
} }
public class StartupArguments : IStartupArguments public class StartupContext : IStartupContext
{ {
public const string APPDATA = "data"; public const string APPDATA = "data";
public const string NO_BROWSER = "nobrowser"; public const string NO_BROWSER = "nobrowser";
@ -18,7 +18,7 @@ namespace NzbDrone.Common.EnvironmentInfo
internal const string UNINSTALL_SERVICE = "u"; internal const string UNINSTALL_SERVICE = "u";
public const string HELP = "?"; public const string HELP = "?";
public StartupArguments(params string[] args) public StartupContext(params string[] args)
{ {
Flags = new HashSet<string>(); Flags = new HashSet<string>();
Args = new Dictionary<string, string>(); Args = new Dictionary<string, string>();
@ -58,5 +58,6 @@ namespace NzbDrone.Common.EnvironmentInfo
return Flags.Contains(UNINSTALL_SERVICE); return Flags.Contains(UNINSTALL_SERVICE);
} }
} }
} }
} }

@ -9,9 +9,9 @@ namespace NzbDrone.Common.Instrumentation
{ {
public static class LogTargets public static class LogTargets
{ {
public static void Register(IStartupArguments startupArguments, bool updateApp, bool inConsole) public static void Register(IStartupContext startupContext, bool updateApp, bool inConsole)
{ {
var appFolderInfo = new AppFolderInfo(new DiskProvider(), startupArguments); var appFolderInfo = new AppFolderInfo(new DiskProvider(), startupContext);
LogManager.Configuration = new LoggingConfiguration(); LogManager.Configuration = new LoggingConfiguration();
@ -24,7 +24,7 @@ namespace NzbDrone.Common.Instrumentation
} }
else else
{ {
if (inConsole && (OsInfo.IsLinux || new RuntimeInfo(null).IsUserInteractive)) if (inConsole && (OsInfo.IsLinux || new RuntimeInfo(null, new ServiceProvider()).IsUserInteractive))
{ {
RegisterConsole(); RegisterConsole();
} }

@ -86,7 +86,7 @@
<Compile Include="EnsureThat\Param.cs" /> <Compile Include="EnsureThat\Param.cs" />
<Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" /> <Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" />
<Compile Include="EnvironmentInfo\BuildInfo.cs" /> <Compile Include="EnvironmentInfo\BuildInfo.cs" />
<Compile Include="EnvironmentInfo\StartupArguments.cs" /> <Compile Include="EnvironmentInfo\StartupContext.cs" />
<Compile Include="EnvironmentInfo\RuntimeInfo.cs" /> <Compile Include="EnvironmentInfo\RuntimeInfo.cs" />
<Compile Include="EnvironmentInfo\OsInfo.cs" /> <Compile Include="EnvironmentInfo\OsInfo.cs" />
<Compile Include="Exceptions\NzbDroneException.cs" /> <Compile Include="Exceptions\NzbDroneException.cs" />

@ -1,7 +1,5 @@
using System; using System;
using System.Threading;
using NLog; using NLog;
using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Instrumentation; using NzbDrone.Common.Instrumentation;
using NzbDrone.Host; using NzbDrone.Host;
@ -16,26 +14,9 @@ namespace NzbDrone.Console
{ {
try try
{ {
var startupArgs = new StartupArguments(args); var startupArgs = new StartupContext(args);
LogTargets.Register(startupArgs, false, true); LogTargets.Register(startupArgs, false, true);
var container = Bootstrap.Start(startupArgs, new ConsoleAlerts()); Bootstrap.Start(startupArgs, new ConsoleAlerts());
if (startupArgs.InstallService || startupArgs.UninstallService)
{
return;
}
var serviceFactory = container.Resolve<INzbDroneServiceFactory>();
while (!serviceFactory.IsServiceStopped)
{
Thread.Sleep(1000);
}
}
catch (TerminateApplicationException e)
{
Logger.Info("Application has been terminated. Reason " + e.Reason);
return;
} }
catch (Exception e) catch (Exception e)
{ {

@ -17,7 +17,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
Mocker.SetConstant<IAppFolderInfo>(new AppFolderInfo(new DiskProvider(), Mocker.Resolve<IStartupArguments>())); Mocker.SetConstant<IAppFolderInfo>(new AppFolderInfo(new DiskProvider(), Mocker.Resolve<IStartupContext>()));
} }
[Test] [Test]

@ -19,18 +19,18 @@ namespace NzbDrone.Host
private readonly IRuntimeInfo _runtimeInfo; private readonly IRuntimeInfo _runtimeInfo;
private readonly IHostController _hostController; private readonly IHostController _hostController;
private readonly PriorityMonitor _priorityMonitor; private readonly PriorityMonitor _priorityMonitor;
private readonly IStartupArguments _startupArguments; private readonly IStartupContext _startupContext;
private readonly IBrowserService _browserService; private readonly IBrowserService _browserService;
private readonly Logger _logger; private readonly Logger _logger;
public NzbDroneServiceFactory(IConfigFileProvider configFileProvider, IHostController hostController, public NzbDroneServiceFactory(IConfigFileProvider configFileProvider, IHostController hostController,
IRuntimeInfo runtimeInfo, PriorityMonitor priorityMonitor, IStartupArguments startupArguments, IBrowserService browserService, Logger logger) IRuntimeInfo runtimeInfo, PriorityMonitor priorityMonitor, IStartupContext startupContext, IBrowserService browserService, Logger logger)
{ {
_configFileProvider = configFileProvider; _configFileProvider = configFileProvider;
_hostController = hostController; _hostController = hostController;
_runtimeInfo = runtimeInfo; _runtimeInfo = runtimeInfo;
_priorityMonitor = priorityMonitor; _priorityMonitor = priorityMonitor;
_startupArguments = startupArguments; _startupContext = startupContext;
_browserService = browserService; _browserService = browserService;
_logger = logger; _logger = logger;
} }
@ -44,9 +44,8 @@ namespace NzbDrone.Host
{ {
_hostController.StartServer(); _hostController.StartServer();
if (!_startupArguments.Flags.Contains(StartupArguments.NO_BROWSER) && if (!_startupContext.Flags.Contains(StartupContext.NO_BROWSER)
_runtimeInfo.IsUserInteractive && && _configFileProvider.LaunchBrowser)
_configFileProvider.LaunchBrowser)
{ {
_browserService.LaunchWebUI(); _browserService.LaunchWebUI();
} }

@ -1,4 +1,7 @@
using System.Reflection; using System;
using System.Reflection;
using System.Threading;
using NLog;
using NzbDrone.Common.Composition; using NzbDrone.Common.Composition;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Instrumentation; using NzbDrone.Common.Instrumentation;
@ -7,18 +10,21 @@ using NzbDrone.Core.Datastore;
namespace NzbDrone.Host namespace NzbDrone.Host
{ {
public class Bootstrap public static class Bootstrap
{ {
public IContainer Container { get; private set; } private static IContainer _container;
private static readonly Logger Logger = NzbDroneLogger.GetLogger();
public Bootstrap(StartupArguments args, IUserAlert userAlert)
public static void Start(StartupContext startupContext, IUserAlert userAlert, Action<IContainer> startCallback = null)
{
try
{ {
var logger = NzbDroneLogger.GetLogger();
GlobalExceptionHandlers.Register(); GlobalExceptionHandlers.Register();
IgnoreCertErrorPolicy.Register(); IgnoreCertErrorPolicy.Register();
logger.Info("Starting NzbDrone Console. Version {0}", Assembly.GetExecutingAssembly().GetName().Version); Logger.Info("Starting NzbDrone Console. Version {0}", Assembly.GetExecutingAssembly().GetName().Version);
if (!PlatformValidation.IsValidate(userAlert)) if (!PlatformValidation.IsValidate(userAlert))
@ -26,21 +32,101 @@ namespace NzbDrone.Host
throw new TerminateApplicationException("Missing system requirements"); throw new TerminateApplicationException("Missing system requirements");
} }
Container = MainAppContainerBuilder.BuildContainer(args); _container = MainAppContainerBuilder.BuildContainer(startupContext);
var appMode = GetApplicationMode(startupContext);
Start(appMode);
if (startCallback != null)
{
startCallback(_container);
} }
public void Start() SpinToExit(appMode);
}
catch (TerminateApplicationException e)
{ {
DbFactory.RegisterDatabase(Container); Logger.Info("Application has been terminated. Reason " + e.Reason);
Container.Resolve<Router>().Route(); }
} }
public void EnsureSingleInstance() private static void Start(ApplicationModes applicationModes)
{
if (!IsInUtilityMode(applicationModes))
{
EnsureSingleInstance();
}
DbFactory.RegisterDatabase(_container);
_container.Resolve<Router>().Route(applicationModes);
}
private static void SpinToExit(ApplicationModes applicationModes)
{
if (IsInUtilityMode(applicationModes))
{ {
Container.Resolve<ISingleInstancePolicy>().EnforceSingleInstance(); return;
}
var serviceFactory = _container.Resolve<INzbDroneServiceFactory>();
while (!serviceFactory.IsServiceStopped)
{
Thread.Sleep(1000);
}
}
private static void EnsureSingleInstance()
{
_container.Resolve<ISingleInstancePolicy>().EnforceSingleInstance();
}
private static ApplicationModes GetApplicationMode(StartupContext startupContext)
{
if (startupContext.Flags.Contains(StartupContext.HELP))
{
return ApplicationModes.Help;
}
if (!OsInfo.IsLinux && startupContext.InstallService)
{
return ApplicationModes.InstallService;
}
if (!OsInfo.IsLinux && startupContext.UninstallService)
{
return ApplicationModes.UninstallService;
}
if (_container.Resolve<IRuntimeInfo>().IsWindowsService)
{
return ApplicationModes.Service;
}
return ApplicationModes.Interactive;
}
private static bool IsInUtilityMode(ApplicationModes applicationMode)
{
switch (applicationMode)
{
case ApplicationModes.InstallService:
case ApplicationModes.UninstallService:
case ApplicationModes.Help:
{
return true;
}
default:
{
return false;
}
}
} }
} }

@ -1,5 +1,6 @@
using System; using System;
using NLog; using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes; using NzbDrone.Common.Processes;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
@ -14,12 +15,14 @@ namespace NzbDrone.Host
{ {
private readonly IProcessProvider _processProvider; private readonly IProcessProvider _processProvider;
private readonly IConfigFileProvider _configFileProvider; private readonly IConfigFileProvider _configFileProvider;
private readonly IRuntimeInfo _runtimeInfo;
private readonly Logger _logger; private readonly Logger _logger;
public BrowserService(IProcessProvider processProvider, IConfigFileProvider configFileProvider, Logger logger) public BrowserService(IProcessProvider processProvider, IConfigFileProvider configFileProvider, IRuntimeInfo runtimeInfo, Logger logger)
{ {
_processProvider = processProvider; _processProvider = processProvider;
_configFileProvider = configFileProvider; _configFileProvider = configFileProvider;
_runtimeInfo = runtimeInfo;
_logger = logger; _logger = logger;
} }
@ -27,13 +30,20 @@ namespace NzbDrone.Host
{ {
var url = string.Format("http://localhost:{0}", _configFileProvider.Port); var url = string.Format("http://localhost:{0}", _configFileProvider.Port);
try try
{
if (_runtimeInfo.IsUserInteractive)
{ {
_logger.Info("Starting default browser. {0}", url); _logger.Info("Starting default browser. {0}", url);
_processProvider.OpenDefaultBrowser(url); _processProvider.OpenDefaultBrowser(url);
} }
else
{
_logger.Debug("none-interactive runtime. Won't attempt to open browser.");
}
}
catch (Exception e) catch (Exception e)
{ {
_logger.ErrorException("Couldn't open defult browser to " + url, e); _logger.ErrorException("Couldn't open default browser to " + url, e);
} }
} }
} }

@ -10,12 +10,12 @@ namespace NzbDrone.Host
{ {
public class MainAppContainerBuilder : ContainerBuilderBase public class MainAppContainerBuilder : ContainerBuilderBase
{ {
public static IContainer BuildContainer(StartupArguments args) public static IContainer BuildContainer(StartupContext args)
{ {
return new MainAppContainerBuilder(args).Container; return new MainAppContainerBuilder(args).Container;
} }
private MainAppContainerBuilder(StartupArguments args) private MainAppContainerBuilder(StartupContext args)
: base(args, "NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api", "NzbDrone.SignalR") : base(args, "NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api", "NzbDrone.SignalR")
{ {

@ -1,7 +1,5 @@
using System.ServiceProcess; using NLog;
using NLog;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
namespace NzbDrone.Host namespace NzbDrone.Host
{ {
@ -9,28 +7,18 @@ namespace NzbDrone.Host
{ {
private readonly INzbDroneServiceFactory _nzbDroneServiceFactory; private readonly INzbDroneServiceFactory _nzbDroneServiceFactory;
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
private readonly IStartupArguments _startupArguments;
private readonly IConsoleService _consoleService; private readonly IConsoleService _consoleService;
private readonly IRuntimeInfo _runtimeInfo;
private readonly Logger _logger; private readonly Logger _logger;
public Router(INzbDroneServiceFactory nzbDroneServiceFactory, IServiceProvider serviceProvider, IStartupArguments startupArguments, public Router(INzbDroneServiceFactory nzbDroneServiceFactory, IServiceProvider serviceProvider,
IConsoleService consoleService, IRuntimeInfo runtimeInfo, Logger logger) IConsoleService consoleService, Logger logger)
{ {
_nzbDroneServiceFactory = nzbDroneServiceFactory; _nzbDroneServiceFactory = nzbDroneServiceFactory;
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
_startupArguments = startupArguments;
_consoleService = consoleService; _consoleService = consoleService;
_runtimeInfo = runtimeInfo;
_logger = logger; _logger = logger;
} }
public void Route()
{
var appMode = GetApplicationMode();
Route(appMode);
}
public void Route(ApplicationModes applicationModes) public void Route(ApplicationModes applicationModes)
{ {
_logger.Info("Application mode: {0}", applicationModes); _logger.Info("Application mode: {0}", applicationModes);
@ -86,32 +74,6 @@ namespace NzbDrone.Host
} }
} }
private ApplicationModes GetApplicationMode()
{
if (!_runtimeInfo.IsUserInteractive &&
OsInfo.IsWindows &&
_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) &&
_serviceProvider.GetStatus(ServiceProvider.NZBDRONE_SERVICE_NAME) == ServiceControllerStatus.StartPending)
{
return ApplicationModes.Service;
}
if (_startupArguments.Flags.Contains(StartupArguments.HELP))
{
return ApplicationModes.Help;
}
if (!OsInfo.IsLinux && _startupArguments.InstallService)
{
return ApplicationModes.InstallService;
}
if (!OsInfo.IsLinux && _startupArguments.UninstallService)
{
return ApplicationModes.UninstallService;
}
return ApplicationModes.Interactive;
}
} }
} }

@ -50,7 +50,7 @@ namespace NzbDrone.Integration.Test
public IntegrationTest() public IntegrationTest()
{ {
new StartupArguments(); new StartupContext();
LogManager.Configuration = new LoggingConfiguration(); LogManager.Configuration = new LoggingConfiguration();
var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" }; var consoleTarget = new ConsoleTarget { Layout = "${level}: ${message} ${exception}" };

@ -12,7 +12,7 @@ namespace NzbDrone.Test.Common
protected static void InitLogging() protected static void InitLogging()
{ {
new StartupArguments(); new StartupContext();
TestLogger = LogManager.GetLogger("TestLogger"); TestLogger = LogManager.GetLogger("TestLogger");

@ -93,7 +93,7 @@ namespace NzbDrone.Test.Common
Mocker.SetConstant(LogManager.GetLogger("TestLogger")); Mocker.SetConstant(LogManager.GetLogger("TestLogger"));
Mocker.SetConstant<IStartupArguments>(new StartupArguments(new string[0])); Mocker.SetConstant<IStartupContext>(new StartupContext(new string[0]));
LogManager.ReconfigExistingLoggers(); LogManager.ReconfigExistingLoggers();

@ -32,7 +32,7 @@ namespace NzbDrone.Update.Test
Subject.Start(AppType.Service, targetFolder); Subject.Start(AppType.Service, targetFolder);
Mocker.GetMock<IProcessProvider>().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\NzbDrone.Console.exe", StartupArguments.NO_BROWSER), Times.Once()); Mocker.GetMock<IProcessProvider>().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\NzbDrone.Console.exe", StartupContext.NO_BROWSER), Times.Once());
ExceptionVerification.ExpectedWarns(1); ExceptionVerification.ExpectedWarns(1);
} }

@ -28,7 +28,7 @@ namespace NzbDrone.Update
{ {
try try
{ {
var startupArgument = new StartupArguments(args); var startupArgument = new StartupContext(args);
LogTargets.Register(startupArgument, true, true); LogTargets.Register(startupArgument, true, true);
Console.WriteLine("Starting NzbDrone Update Client"); Console.WriteLine("Starting NzbDrone Update Client");

@ -5,15 +5,15 @@ namespace NzbDrone.Update
{ {
public class UpdateContainerBuilder : ContainerBuilderBase public class UpdateContainerBuilder : ContainerBuilderBase
{ {
private UpdateContainerBuilder(IStartupArguments startupArguments) private UpdateContainerBuilder(IStartupContext startupContext)
: base(startupArguments, "NzbDrone.Update", "NzbDrone.Common") : base(startupContext, "NzbDrone.Update", "NzbDrone.Common")
{ {
} }
public static IContainer Build(IStartupArguments startupArguments) public static IContainer Build(IStartupContext startupContext)
{ {
return new UpdateContainerBuilder(startupArguments).Container; return new UpdateContainerBuilder(startupContext).Container;
} }
} }
} }

@ -73,7 +73,7 @@ namespace NzbDrone.Update.UpdateEngine
_logger.Info("Starting {0}", fileName); _logger.Info("Starting {0}", fileName);
var path = Path.Combine(installationFolder, fileName); var path = Path.Combine(installationFolder, fileName);
_processProvider.SpawnNewProcess(path, StartupArguments.NO_BROWSER); _processProvider.SpawnNewProcess(path, StartupContext.NO_BROWSER);
} }
} }
} }

@ -3,7 +3,6 @@ using System.ComponentModel;
using System.Windows.Forms; using System.Windows.Forms;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Host; using NzbDrone.Host;
using NzbDrone.Host.Owin;
namespace NzbDrone.SysTray namespace NzbDrone.SysTray
{ {

@ -16,22 +16,16 @@ namespace NzbDrone
{ {
try try
{ {
var startupArgs = new StartupArguments(args); var startupArgs = new StartupContext(args);
LogTargets.Register(startupArgs, false, true); LogTargets.Register(startupArgs, false, true);
var bootstrap = new Bootstrap(startupArgs, new MessageBoxUserAlert()); Bootstrap.Start(startupArgs, new MessageBoxUserAlert(), container =>
bootstrap.EnsureSingleInstance();
bootstrap.Start();
bootstrap.Container.Register<ISystemTrayApp, SystemTrayApp>();
bootstrap.Container.Resolve<ISystemTrayApp>().Start();
}
catch (TerminateApplicationException e)
{ {
Logger.Info("Application has been terminated. Reason " + e.Reason); container.Register<ISystemTrayApp, SystemTrayApp>();
var trayApp = container.Resolve<ISystemTrayApp>();
trayApp.Start();
});
} }
catch (Exception e) catch (Exception e)
{ {

Loading…
Cancel
Save