mirror of https://github.com/Radarr/Radarr
Allow Sonarr and Radarr to run together.
Also changes default port of Radarr to 7878. However, now multiple instances of Radarr can also be run. This should be fixed in the future.
This commit is contained in:
parent
6ca88f98af
commit
e9f9f66b2f
|
@ -40,7 +40,7 @@ namespace NzbDrone.Automation.Test
|
|||
_runner.KillAll();
|
||||
_runner.Start();
|
||||
|
||||
driver.Url = "http://localhost:8989";
|
||||
driver.Url = "http://localhost:7878";
|
||||
|
||||
var page = new PageBase(driver);
|
||||
page.WaitForNoSpinner();
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace NzbDrone.Common.Test
|
|||
public void GetValue_Success()
|
||||
{
|
||||
const string key = "Port";
|
||||
const string value = "8989";
|
||||
const string value = "7878";
|
||||
|
||||
var result = Subject.GetValue(key, value);
|
||||
|
||||
|
@ -60,7 +60,7 @@ namespace NzbDrone.Common.Test
|
|||
public void GetInt_Success()
|
||||
{
|
||||
const string key = "Port";
|
||||
const int value = 8989;
|
||||
const int value = 7878;
|
||||
|
||||
|
||||
var result = Subject.GetValueInt(key, value);
|
||||
|
@ -95,7 +95,7 @@ namespace NzbDrone.Common.Test
|
|||
[Test]
|
||||
public void GetPort_Success()
|
||||
{
|
||||
const int value = 8989;
|
||||
const int value = 7878;
|
||||
|
||||
|
||||
var result = Subject.Port;
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace NzbDrone.Console
|
|||
{
|
||||
System.Console.WriteLine("");
|
||||
System.Console.WriteLine("");
|
||||
Logger.Fatal(exception.Message + ". This can happen if another instance of Sonarr is already running another application is using the same port (default: 8989) or the user has insufficient permissions");
|
||||
Logger.Fatal(exception.Message + ". This can happen if another instance of Sonarr is already running another application is using the same port (default: 7878) or the user has insufficient permissions");
|
||||
System.Console.WriteLine("Press enter to exit...");
|
||||
System.Console.ReadLine();
|
||||
Environment.Exit(1);
|
||||
|
|
|
@ -133,7 +133,7 @@ namespace NzbDrone.Core.Configuration
|
|||
}
|
||||
}
|
||||
|
||||
public int Port => GetValueInt("Port", 8989);
|
||||
public int Port => GetValueInt("Port", 7878);
|
||||
|
||||
public int SslPort => GetValueInt("SslPort", 9898);
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@ namespace NzbDrone.Host
|
|||
{
|
||||
if (IsAlreadyRunning())
|
||||
{
|
||||
_logger.Warn("Another instance of Sonarr is already running.");
|
||||
_logger.Warn("Another instance of Sonarr or Radarr is already running.");
|
||||
_browserService.LaunchWebUI();
|
||||
throw new TerminateApplicationException("Another instance is already running");
|
||||
//throw new TerminateApplicationException("Another instance is already running"); TODO: detect only radarr
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ namespace NzbDrone.Integration.Test
|
|||
|
||||
public override string SeriesRootFolder => GetTempDirectory("SeriesRootFolder");
|
||||
|
||||
protected override string RootUrl => "http://localhost:8989/";
|
||||
protected override string RootUrl => "http://localhost:7878/";
|
||||
|
||||
protected override string ApiKey => _runner.ApiKey;
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ namespace NzbDrone.Integration.Test
|
|||
protected void ConnectSignalR()
|
||||
{
|
||||
_signalRReceived = new List<SignalRMessage>();
|
||||
_signalrConnection = new Connection("http://localhost:8989/signalr");
|
||||
_signalrConnection = new Connection("http://localhost:7878/signalr");
|
||||
_signalrConnection.Start(new LongPollingTransport()).ContinueWith(task =>
|
||||
{
|
||||
if (task.IsFaulted)
|
||||
|
|
|
@ -22,10 +22,10 @@ namespace NzbDrone.Test.Common
|
|||
public string AppData { get; private set; }
|
||||
public string ApiKey { get; private set; }
|
||||
|
||||
public NzbDroneRunner(Logger logger, int port = 8989)
|
||||
public NzbDroneRunner(Logger logger, int port = 7878)
|
||||
{
|
||||
_processProvider = new ProcessProvider(logger);
|
||||
_restClient = new RestClient("http://localhost:8989/api");
|
||||
_restClient = new RestClient("http://localhost:7878/api");
|
||||
}
|
||||
|
||||
public void Start()
|
||||
|
|
Loading…
Reference in New Issue