diff --git a/NzbDrone.Common/ServiceProvider.cs b/NzbDrone.Common/ServiceProvider.cs index 46c967dcc..7bebe5f20 100644 --- a/NzbDrone.Common/ServiceProvider.cs +++ b/NzbDrone.Common/ServiceProvider.cs @@ -32,7 +32,6 @@ namespace NzbDrone.Common return service != null && service.Status == ServiceControllerStatus.Running; } - public virtual void Install(string serviceName) { Logger.Info("Installing service '{0}'", serviceName); @@ -78,7 +77,6 @@ namespace NzbDrone.Common Logger.Info("{0} successfully uninstalled", serviceName); } - public virtual void Run(ServiceBase service) { ServiceBase.Run(service); @@ -131,6 +129,7 @@ namespace NzbDrone.Common if (service == null) { Logger.Warn("Unable to start '{0}' no service with that name exists.", serviceName); + return; } if (service.Status != ServiceControllerStatus.Paused && service.Status != ServiceControllerStatus.Stopped) diff --git a/NzbDrone.Update/Program.cs b/NzbDrone.Update/Program.cs index aa12e1fe8..aeceb4089 100644 --- a/NzbDrone.Update/Program.cs +++ b/NzbDrone.Update/Program.cs @@ -42,7 +42,6 @@ namespace NzbDrone.Update } TransferUpdateLogs(); - } private static void TransferUpdateLogs() diff --git a/NzbDrone.Update/Providers/UpdateProvider.cs b/NzbDrone.Update/Providers/UpdateProvider.cs index 0bb250ad1..c05a6de21 100644 --- a/NzbDrone.Update/Providers/UpdateProvider.cs +++ b/NzbDrone.Update/Providers/UpdateProvider.cs @@ -115,19 +115,22 @@ namespace NzbDrone.Update.Providers _diskProvider.CopyDirectory(_environmentProvider.GetUpdateBackUpFolder(), targetFolder); } - private void StartNzbDrone(AppType appType, string targetFolder) { + logger.Info("Starting NzbDrone"); if (appType == AppType.Service) { + logger.Info("Starting NzbDrone service"); _serviceProvider.Start(ServiceProvider.NZBDRONE_SERVICE_NAME); } else if(appType == AppType.Console) { + logger.Info("Starting NzbDrone with Console"); _processProvider.Start(Path.Combine(targetFolder, "NzbDrone.Console.exe")); } else { + logger.Info("Starting NzbDrone without Console"); _processProvider.Start(Path.Combine(targetFolder, "NzbDrone.exe")); } }