Some fixes for distributed deployment

MUnique · Nov 23, 2023 · 11a6f01 · 11a6f01
1 parent f66ff9c
commit 11a6f01
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 11 deletions.
diff --git a/deploy/all-in-one/nginx.dev.conf b/deploy/all-in-one/nginx.dev.conf
@@ -20,7 +20,7 @@ http {
     resolver 127.0.0.11 ipv6=off;
 
     location / {
-       proxy_pass http://openmu-startup;
+       proxy_pass http://openmu-startup:8080;
     }
   }
 }
diff --git a/deploy/distributed/docker-compose.yml b/deploy/distributed/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - prometheus
 
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana:9.5.14
     container_name: grafana
     volumes:
       - ./grafana.ini:/etc/grafana/grafana.ini

diff --git a/deploy/distributed/nginx.dev.conf b/deploy/distributed/nginx.dev.conf
@@ -48,18 +48,18 @@ http {
     }
 
     location ~ (/admin)(.*) {
-       proxy_pass http://adminPanel/admin$2;
+       proxy_pass http://adminPanel:8080/admin$2;
     }
 
     # Public API
     location ~ (/serverInfo)(.*) {
-       proxy_pass http://connectServer/serverInfo$2;
+       proxy_pass http://connectServer:8080/serverInfo$2;
        auth_basic off;
     }
 
     # Game Servers:
     location ~ (/gameServer/(\d+)(.*)) {
-       proxy_pass http://gameServer$2$1;
+       proxy_pass http://gameServer$2:8080$1;
     }
   }
 }
diff --git a/deploy/distributed/nginx.prod443.conf b/deploy/distributed/nginx.prod443.conf
@@ -64,7 +64,7 @@ http {
 
         # Game Servers:
         location ~ (/gameServer/(\d+)(.*)) {
-           proxy_pass http://gameServer:8080$2$1;
+           proxy_pass http://gameServer$2:8080$1;
         }
     }
 }
diff --git a/src/Dapr/AdminPanel.Host/Program.cs b/src/Dapr/AdminPanel.Host/Program.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
+using Microsoft.AspNetCore.Builder;
 using MUnique.OpenMU.Dapr.Common;
 using MUnique.OpenMU.PlugIns;
 using MUnique.OpenMU.Web.AdminPanel;
@@ -18,7 +19,12 @@
 
 builder.AddAdminPanel();
 
+var metricsRegistry = new MetricsRegistry();
+// todo: add some meaningful metrics
+builder.AddOpenTelemetryMetrics(metricsRegistry);
+
 var app = builder.BuildAndConfigure(true);
+app.UseStaticFiles();
 
 await app.WaitForDatabaseConnectionInitializationAsync().ConfigureAwait(false);
 

diff --git a/src/Dapr/Common/DaprService.cs b/src/Dapr/Common/DaprService.cs
@@ -32,7 +32,7 @@ public static WebApplicationBuilder CreateBuilder(string serviceName, string[] a
     {
         var builder = WebApplication.CreateBuilder(args);
 
-        builder.WebHost.UseUrls($"http://*:80");
+        builder.WebHost.UseUrls($"http://*:8080");
 
         var services = builder.Services;
         services.AddControllers();

diff --git a/src/Dapr/Common/Extensions.cs b/src/Dapr/Common/Extensions.cs
@@ -255,7 +255,11 @@ public static WebApplication ConfigureDaprService(this WebApplication app, bool
 
         if (addBlazor)
         {
-            if (!app.Environment.IsDevelopment())
+            if (app.Environment.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+            else
             {
                 app.UseExceptionHandler("/Error");
             }

diff --git a/src/Dapr/FriendServer.Host/Program.cs b/src/Dapr/FriendServer.Host/Program.cs
@@ -19,6 +19,10 @@
     .AddSingleton<IFriendNotifier, FriendNotifier>()
     .AddPeristenceProvider();
 
+var metricsRegistry = new MetricsRegistry();
+// todo: add some meaningful metrics
+builder.AddOpenTelemetryMetrics(metricsRegistry);
+
 var app = builder.BuildAndConfigure();
 
 await app.WaitForUpdatedDatabaseAsync().ConfigureAwait(false);

diff --git a/src/Dapr/GameServer.Host/Program.cs b/src/Dapr/GameServer.Host/Program.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE file in the project root for full license information.
 // </copyright>
 
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using MUnique.OpenMU.Dapr.Common;
 using MUnique.OpenMU.DataModel.Configuration;
@@ -53,7 +54,7 @@
 builder.AddOpenTelemetryMetrics(metricsRegistry);
 
 var app = builder.BuildAndConfigure(true);
-
+app.UseStaticFiles();
 await app.WaitForUpdatedDatabaseAsync().ConfigureAwait(false);
 
 await app.Services.TryLoadPlugInConfigurationsAsync(plugInConfigurations).ConfigureAwait(false);

diff --git a/src/Dapr/GuildServer.Host/Program.cs b/src/Dapr/GuildServer.Host/Program.cs
@@ -17,6 +17,10 @@
     .AddSingleton<IGuildChangePublisher, GuildChangePublisher>()
     .AddPeristenceProvider();
 
+var metricsRegistry = new MetricsRegistry();
+// todo: add some meaningful metrics
+builder.AddOpenTelemetryMetrics(metricsRegistry);
+
 var app = builder.BuildAndConfigure();
 await app.WaitForUpdatedDatabaseAsync().ConfigureAwait(false);
 

diff --git a/src/Dapr/LoginServer.Host/Program.cs b/src/Dapr/LoginServer.Host/Program.cs
@@ -14,6 +14,10 @@
     .AddHostedService<LoginStateCleanup>()
     .AddSingleton<GameServerRegistry>();
 
+var metricsRegistry = new MetricsRegistry();
+// todo: add some meaningful metrics
+builder.AddOpenTelemetryMetrics(metricsRegistry);
+
 var app = builder.BuildAndConfigure();
 
 app.Run();
diff --git a/src/Web/AdminPanel/WebApplicationExtensions.cs b/src/Web/AdminPanel/WebApplicationExtensions.cs
@@ -78,7 +78,11 @@ public static WebApplicationBuilder AddAdminPanel(this WebApplicationBuilder bui
     /// <returns>The configured web application.</returns>
     public static WebApplication ConfigureAdminPanel(this WebApplication app)
     {
-        if (!app.Environment.IsDevelopment())
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
         {
             app.UseExceptionHandler("/Error");
         }

diff --git a/src/Web/Map/MapApp.cs b/src/Web/Map/MapApp.cs
@@ -60,7 +60,11 @@ public async Task StartAsync(CancellationToken cancellationToken)
         app.Configuration["urls"] = $"http://*:{port}";
 
         // Configure the HTTP request pipeline.
-        if (!app.Environment.IsDevelopment())
+        if (app.Environment.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
         {
             app.UseExceptionHandler("/Error");
         }