1
0
mirror of https://github.com/Radarr/Radarr.git synced 2024-07-07 04:19:25 +02:00
* Fixed: Raise ApplicationStartupEvent after Owin is running.

* Actually inject the container.
This commit is contained in:
Mike 2017-11-08 19:39:50 +01:00 committed by GitHub
parent cb857934c4
commit ec3f094d12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions

3
.gitignore vendored
View File

@ -150,3 +150,6 @@ Thumbs.db
# AppVeyor
/tools-cake/
/_artifacts/
# Cake
/tools/Addins/*

View File

@ -34,7 +34,6 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline
RegisterPipelines(pipelines);
container.Resolve<DatabaseTarget>().Register();
container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
}
private void RegisterPipelines(IPipelines pipelines)
@ -56,4 +55,4 @@ protected override TinyIoCContainer GetApplicationContainer()
protected override byte[] FavIcon => null;
}
}
}

View File

@ -1,6 +1,7 @@
using System;
using System;
using System.ServiceProcess;
using NLog;
using NzbDrone.Common.Composition;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Lifecycle;
@ -22,6 +23,7 @@ public class NzbDroneServiceFactory : ServiceBase, INzbDroneServiceFactory, IHan
private readonly IHostController _hostController;
private readonly IStartupContext _startupContext;
private readonly IBrowserService _browserService;
private readonly IContainer _container;
private readonly Logger _logger;
public NzbDroneServiceFactory(IConfigFileProvider configFileProvider,
@ -29,6 +31,7 @@ public NzbDroneServiceFactory(IConfigFileProvider configFileProvider,
IRuntimeInfo runtimeInfo,
IStartupContext startupContext,
IBrowserService browserService,
IContainer container,
Logger logger)
{
_configFileProvider = configFileProvider;
@ -36,6 +39,7 @@ public NzbDroneServiceFactory(IConfigFileProvider configFileProvider,
_runtimeInfo = runtimeInfo;
_startupContext = startupContext;
_browserService = browserService;
_container = container;
_logger = logger;
}
@ -59,6 +63,8 @@ public void Start()
{
_browserService.LaunchWebUI();
}
_container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
}
protected override void OnStop()
@ -93,4 +99,4 @@ public void Handle(ApplicationShutdownRequested message)
}
}
}
}
}