mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2024-12-28 10:37:41 +00:00
Code Issues Releases Wiki Activity

Tweaked SingleInstancePolicy not to cancel startup if AppData is overridden is set

Browse source
This commit is contained in:
Qstick 2017-10-28 16:35:02 -04:00
parent d6bb4c29d0
commit ba27554bd3
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/NzbDrone.Host/Bootstrap.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using NLog; using NLog;
@ -88,11 +88,15 @@ private static void EnsureSingleInstance(bool isService, IStartupContext startup
{ {
var instancePolicy = _container.Resolve<ISingleInstancePolicy>(); var instancePolicy = _container.Resolve<ISingleInstancePolicy>();
if (isService) if (startupContext.Flags.Contains(StartupContext.TERMINATE))
{ {
instancePolicy.KillAllOtherInstance(); instancePolicy.KillAllOtherInstance();
} }
else if (startupContext.Flags.Contains(StartupContext.TERMINATE)) else if (startupContext.Args.ContainsKey(StartupContext.APPDATA))
{
instancePolicy.WarnIfAlreadyRunning();
}
else if (isService)
{ {
instancePolicy.KillAllOtherInstance(); instancePolicy.KillAllOtherInstance();
} }

13
src/NzbDrone.Host/SingleInstancePolicy.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NLog; using NLog;
@ -10,6 +10,7 @@ public interface ISingleInstancePolicy
{ {
void PreventStartIfAlreadyRunning(); void PreventStartIfAlreadyRunning();
void KillAllOtherInstance(); void KillAllOtherInstance();
void WarnIfAlreadyRunning();
} }
public class SingleInstancePolicy : ISingleInstancePolicy public class SingleInstancePolicy : ISingleInstancePolicy
@ -45,6 +46,14 @@ public void KillAllOtherInstance()
} }
} }
public void WarnIfAlreadyRunning()
{
if (IsAlreadyRunning())
{
_logger.Debug("Another instance of Lidarr is already running.");
}
}
private bool IsAlreadyRunning() private bool IsAlreadyRunning()
{ {
return GetOtherNzbDroneProcessIds().Any(); return GetOtherNzbDroneProcessIds().Any();
@ -76,4 +85,4 @@ private List<int> GetOtherNzbDroneProcessIds()
} }
} }
} }
} }