mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Relax SingleInstancePolicy when using a custom data directory Fixes #1765 (#1782)

This commit is contained in:
Richard Schwab 2017-07-16 15:08:16 +02:00 committed by Leonardo Galli
parent 964c18b236
commit b82f2376a7
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Host/Bootstrap.cs
View File

@ -88,11 +88,15 @@ namespace Radarr.Host
{
var instancePolicy = _container.Resolve<ISingleInstancePolicy>();
if (isService)
if (startupContext.Flags.Contains(StartupContext.TERMINATE))
{
instancePolicy.KillAllOtherInstance();
}
else if (startupContext.Flags.Contains(StartupContext.TERMINATE))
else if (startupContext.Args.ContainsKey(StartupContext.APPDATA))
{
instancePolicy.WarnIfAlreadyRunning();
}
else if (isService)
{
instancePolicy.KillAllOtherInstance();
}

15
src/NzbDrone.Host/SingleInstancePolicy.cs
View File

@ -10,6 +10,7 @@ namespace Radarr.Host
{
void PreventStartIfAlreadyRunning();
void KillAllOtherInstance();
void WarnIfAlreadyRunning();
}
public class SingleInstancePolicy : ISingleInstancePolicy
@ -45,6 +46,14 @@ namespace Radarr.Host
}
}
public void WarnIfAlreadyRunning()
{
if (IsAlreadyRunning())
{
_logger.Debug("Another instance of Radarr is already running.");
}
}
private bool IsAlreadyRunning()
{
return GetOtherNzbDroneProcessIds().Any();
@ -64,16 +73,16 @@ namespace Radarr.Host
if (otherProcesses.Any())
{
_logger.Info("{0} instance(s) of Sonarr are running", otherProcesses.Count);
_logger.Info("{0} instance(s) of Radarr are running", otherProcesses.Count);
}
return otherProcesses;
}
catch (Exception ex)
{
_logger.Warn(ex, "Failed to check for multiple instances of Sonarr.");
_logger.Warn(ex, "Failed to check for multiple instances of Radarr.");
return new List<int>();
}
}
}
}
}