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

More logging and better handling of services

This commit is contained in:
Mark McDowall 2013-01-15 15:17:12 -08:00
parent a2e237b926
commit 7eb522f871
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NzbDrone.Update/Providers/UpdateProvider.cs
View File

@ -59,13 +59,16 @@ namespace NzbDrone.Update.Providers
_serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME);
}
//TODO:Should be able to restart service if anything beyond this point fails
else
{
appType = AppType.Normal;
}
//TODO:Should be able to restart service if anything beyond this point fails
logger.Info("Killing all running processes");
var processes = _processProvider.GetProcessByName(ProcessProvider.NzbDroneProccessName);
foreach (var processInfo in processes)
{
appType = AppType.Normal;
_processProvider.Kill(processInfo.Id);
}

8
NzbDrone/Router.cs
View File

@ -36,29 +36,32 @@ namespace NzbDrone
public void Route(ApplicationMode applicationMode)
{
logger.Info("Application mode: {0}", applicationMode);
if(!_environmentProvider.IsUserInteractive)
{
applicationMode = ApplicationMode.Service;
}
logger.Info("Application mode: {0}", applicationMode);
switch (applicationMode)
{
case ApplicationMode.Service:
{
logger.Trace("Service selected");
_serviceProvider.Run(_applicationServer);
break;
}
case ApplicationMode.Console:
{
logger.Trace("Console selected");
_applicationServer.Start();
_consoleProvider.WaitForClose();
break;
}
case ApplicationMode.InstallService:
{
logger.Trace("Install Service selected");
if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME))
{
_consoleProvider.PrintServiceAlreadyExist();
@ -72,6 +75,7 @@ namespace NzbDrone
}
case ApplicationMode.UninstallService:
{
logger.Trace("Uninstall Service selected");
if (!_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME))
{
_consoleProvider.PrintServiceDoestExist();