diff --git a/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs b/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs index 739a8919b..4bedefb05 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/StartupContext.cs @@ -24,6 +24,7 @@ namespace NzbDrone.Common.EnvironmentInfo public const string TERMINATE = "terminateexisting"; public const string RESTART = "restart"; public const string REGISTER_URL = "registerurl"; + public const string NO_SINGLE_INSTANCE_CHECK = "nosingleinstancecheck"; public StartupContext(params string[] args) { diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs index 685a36679..c7eb10895 100644 --- a/src/NzbDrone.Common/Processes/ProcessProvider.cs +++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs @@ -340,8 +340,6 @@ namespace NzbDrone.Common.Processes //TODO: move this to an OS specific class var monoProcesses = Process.GetProcessesByName("mono") .Union(Process.GetProcessesByName("mono-sgen")) - .Union(Process.GetProcessesByName("mono-sgen32")) - .Union(Process.GetProcessesByName("mono-sgen64")) .Where(process => process.Modules.Cast() .Any(module => diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs index f0a7f473a..b8679bb66 100644 --- a/src/NzbDrone.Host/Bootstrap.cs +++ b/src/NzbDrone.Host/Bootstrap.cs @@ -88,6 +88,11 @@ namespace Radarr.Host private static void EnsureSingleInstance(bool isService, IStartupContext startupContext) { + if (startupContext.Flags.Contains(StartupContext.NO_SINGLE_INSTANCE_CHECK)) + { + return; + } + var instancePolicy = _container.Resolve(); if (startupContext.Flags.Contains(StartupContext.TERMINATE)) diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index b00759ea7..52e7330a9 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -138,7 +138,7 @@ namespace NzbDrone.Test.Common private void Start(string outputRadarrConsoleExe) { TestContext.Progress.WriteLine("Starting instance from {0} on port {1}", outputRadarrConsoleExe, Port); - var args = "-nobrowser -data=\"" + AppData + "\""; + var args = "-nobrowser -nosingleinstancecheck -data=\"" + AppData + "\""; _nzbDroneProcess = _processProvider.Start(outputRadarrConsoleExe, args, null, OnOutputDataReceived, OnOutputDataReceived); }