mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-25 17:27:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Browse source 
Conflicts:
	NzbDrone.Core.Test/ParserTest.cs
This commit is contained in:
Mark McDowall 2011-10-24 23:22:34 -07:00
commit 6b26843b50
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NzbDrone.Common/ServiceProvider.cs
View file

@ -1,11 +1,10 @@
using System; using System;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Configuration.Install; using System.Configuration.Install;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reflection;
using System.ServiceProcess; using System.ServiceProcess;
using NLog; using NLog;
using TimeoutException = System.TimeoutException;
namespace NzbDrone.Common namespace NzbDrone.Common
{ {
@ -37,7 +36,7 @@ namespace NzbDrone.Common
var serviceInstaller = new ServiceInstaller(); var serviceInstaller = new ServiceInstaller();
String[] cmdline = { @"/assemblypath=" + Assembly.GetExecutingAssembly().Location }; String[] cmdline = { @"/assemblypath=" + Process.GetCurrentProcess().StartInfo.FileName };
var context = new InstallContext("service_install.log", cmdline); var context = new InstallContext("service_install.log", cmdline);
serviceInstaller.Context = context; serviceInstaller.Context = context;
@ -86,6 +85,7 @@ namespace NzbDrone.Common
if (service == null) if (service == null)
{ {
Logger.Warn("Unable to stop {0}. no service with that name exists.", serviceName); Logger.Warn("Unable to stop {0}. no service with that name exists.", serviceName);
return;
} }
Logger.Info("Service is currently {0}", service.Status); Logger.Info("Service is currently {0}", service.Status);

2
NzbDrone.Core.Test/ParserTest.cs
View file

@ -377,4 +377,4 @@ namespace NzbDrone.Core.Test
result.Should().BeNull(); result.Should().BeNull();
} }
} }
} }