Changes based on feedback

Author: johnsimons

src/ServiceControl/Hosting/Commands/RunCommand.cs

@@ -1,17 +1,13 @@
 namespace ServiceControl.Hosting.Commands
 {
-    using System;
-    using System.IO;
-    using System.Reflection;
     using System.Threading.Tasks;
-    using Infrastructure.WebApi;
     using Microsoft.AspNetCore.Builder;
-    using Microsoft.Extensions.FileProviders;
     using NServiceBus;
     using Particular.ServiceControl;
     using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
     using ServiceControl;
+    using ServiceControl.Infrastructure.WebApi;
 
     class RunCommand : AbstractCommand
     {
@@ -27,17 +23,9 @@ public override async Task Execute(HostArguments args, Settings settings)
             hostBuilder.AddServiceControl(settings, endpointConfiguration);
             hostBuilder.AddServiceControlApi();
 
-            var servicePulsePath = Path.Combine(AppContext.BaseDirectory, "platform", "servicepulse", "ServicePulse.dll");
-            var manifestEmbeddedFileProvider = new ManifestEmbeddedFileProvider(Assembly.LoadFrom(servicePulsePath), "wwwroot");
-            var fileProvider = new CompositeFileProvider(hostBuilder.Environment.WebRootFileProvider, manifestEmbeddedFileProvider);
-            var defaultFilesOptions = new DefaultFilesOptions { FileProvider = fileProvider };
-            var staticFileOptions = new StaticFileOptions { FileProvider = fileProvider };
-
             var app = hostBuilder.Build();
-            app.UseServiceControl()
-                .UseMiddleware<AppConstantsMiddleware>()
-                .UseDefaultFiles(defaultFilesOptions)
-                .UseStaticFiles(staticFileOptions);
+            app.UseServiceControl();
+            app.UseServicePulse();
 
             await app.RunAsync(settings.RootUrl);
         }

src/ServiceControl/Infrastructure/WebApi/AppConstantsMiddleware.cs

@@ -19,7 +19,7 @@ public AppConstantsMiddleware(RequestDelegate next)
             var settings = ServicePulseSettings.GetFromEnvironmentVariables();
             var constants = new
             {
-                default_route = "/dashboard",
+                default_route = settings.DefaultRoute,
                 service_control_url = "api/",
                 monitoring_urls = new[] { settings.MonitoringUri.ToString() },
                 showPendingRetry = settings.ShowPendingRetry,

src/ServiceControl/WebApplicationExtensions.cs

@@ -1,9 +1,13 @@
 namespace ServiceControl;
 
+using System;
+using System.IO;
+using System.Reflection;
 using Infrastructure.SignalR;
 using Infrastructure.WebApi;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.FileProviders;
 
 public static class WebApplicationExtensions
 {
@@ -19,4 +23,19 @@ public static IApplicationBuilder UseServiceControl(this WebApplication app)
 
         return app;
     }
+
+    public static IApplicationBuilder UseServicePulse(this WebApplication app)
+    {
+        var servicePulsePath = Path.Combine(AppContext.BaseDirectory, "platform", "servicepulse", "ServicePulse.dll");
+        var manifestEmbeddedFileProvider = new ManifestEmbeddedFileProvider(Assembly.LoadFrom(servicePulsePath), "wwwroot");
+        var fileProvider = new CompositeFileProvider(app.Environment.WebRootFileProvider, manifestEmbeddedFileProvider);
+        var defaultFilesOptions = new DefaultFilesOptions { FileProvider = fileProvider };
+        var staticFileOptions = new StaticFileOptions { FileProvider = fileProvider };
+
+        app.UseMiddleware<AppConstantsMiddleware>()
+            .UseDefaultFiles(defaultFilesOptions)
+            .UseStaticFiles(staticFileOptions);
+
+        return app;
+    }
 }