diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs
index 10e52d48ea..8d0a203961 100644
--- a/src/Tgstation.Server.Host/Core/Application.cs
+++ b/src/Tgstation.Server.Host/Core/Application.cs
@@ -371,6 +371,7 @@ namespace Tgstation.Server.Host.Core
/// The for the
/// The value of
/// The .
+ /// The .
/// The containing the to use
/// The containing the to use
/// The for the
@@ -379,6 +380,7 @@ namespace Tgstation.Server.Host.Core
IServerControl serverControl,
ITokenFactory tokenFactory,
IInstanceManager instanceManager,
+ IServerPortProvider serverPortProvider,
IOptions controlPanelConfigurationOptions,
IOptions generalConfigurationOptions,
ILogger logger)
@@ -493,7 +495,7 @@ namespace Tgstation.Server.Host.Core
logger.LogTrace("DMAPI version: {0}", masterVersionsAttribute.RawDMApiVersion);
logger.LogTrace("Web control panel version: {0}", masterVersionsAttribute.RawControlPanelVersion);
- logger.LogDebug("Starting hosting...");
+ logger.LogDebug("Starting hosting on port {0}...", serverPortProvider.HttpApiPort);
}
}
}
diff --git a/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs b/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
index 09f3b4bb51..e1fafbddc5 100644
--- a/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
+++ b/src/Tgstation.Server.Host/Extensions/WebHostBuilderExtensions.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@@ -43,6 +43,7 @@ namespace Tgstation.Server.Host.Extensions
applicationBuilder.ApplicationServices.GetRequiredService(),
applicationBuilder.ApplicationServices.GetRequiredService(),
applicationBuilder.ApplicationServices.GetRequiredService(),
+ applicationBuilder.ApplicationServices.GetRequiredService(),
applicationBuilder.ApplicationServices.GetRequiredService>(),
applicationBuilder.ApplicationServices.GetRequiredService>(),
applicationBuilder.ApplicationServices.GetRequiredService>()));
diff --git a/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs b/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
index b94d88c5ad..672fadd9c9 100644
--- a/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
+++ b/tests/Tgstation.Server.Host.Tests/Core/TestApplication.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Configuration;
@@ -31,28 +31,32 @@ namespace Tgstation.Server.Host.Core.Tests
var app = new Application(mockConfiguration.Object, mockHostingEnvironment.Object);
Assert.ThrowsException(() => app.ConfigureServices(null));
- Assert.ThrowsException(() => app.Configure(null, null, null, null, null, null, null));
+ Assert.ThrowsException(() => app.Configure(null, null, null, null, null, null, null, null));
var mockAppBuilder = new Mock();
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, null, null, null, null, null, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, null, null, null, null, null, null, null));
var mockServerControl = new Mock();
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, null, null, null, null, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, null, null, null, null, null, null));
var mockTokenFactory = new Mock();
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, null, null, null, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, null, null, null, null, null));
var mockInstanceManager = new Mock();
mockInstanceManager.SetupGet(x => x.Ready).Returns(Extensions.TaskExtensions.InfiniteTask());
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, null, null, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, null, null, null, null));
+
+ var mockServerPortProvider = new Mock();
+ mockServerPortProvider.SetupGet(x => x.HttpApiPort).Returns(5345);
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, mockServerPortProvider.Object, null, null, null));
var mockControlPanelOptions = new Mock>();
mockControlPanelOptions.SetupGet(x => x.Value).Returns(new ControlPanelConfiguration()).Verifiable();
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, mockControlPanelOptions.Object, null, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, mockServerPortProvider.Object, mockControlPanelOptions.Object, null, null));
var mockGeneralOptions = new Mock>();
mockGeneralOptions.SetupGet(x => x.Value).Returns(new GeneralConfiguration()).Verifiable();
- Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, mockControlPanelOptions.Object, mockGeneralOptions.Object, null));
+ Assert.ThrowsException(() => app.Configure(mockAppBuilder.Object, mockServerControl.Object, mockTokenFactory.Object, mockInstanceManager.Object, mockServerPortProvider.Object, mockControlPanelOptions.Object, mockGeneralOptions.Object, null));
mockControlPanelOptions.VerifyAll();
mockGeneralOptions.VerifyAll();
}