Merge pull request #35 from judah4/more-web-api-improvements

More web api improvements
judah4 · Nov 2, 2022 · 5310a02 · 5310a02
2 parents 98d92bc + 3cdb781
commit 5310a02
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 26 deletions.
diff --git a/Mmo Game Framework/MainServer/Program.cs b/Mmo Game Framework/MainServer/Program.cs
@@ -16,6 +16,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 
 namespace MmoGameFramework
 {
@@ -31,21 +32,7 @@ static async Task Main(string[] args)
             //var metricServer = new KestrelMetricServer(port: 1234);
             //metricServer.Start();
 
-            IHost host = Host.CreateDefaultBuilder(args)
-                .ConfigureLogging(builder =>
-                {
-                    builder.AddSimpleConsole(options =>
-                    {
-                        options.IncludeScopes = true;
-                        options.SingleLine = true;
-                        options.TimestampFormat = "hh:mm:ss ";
-                    });
-                })
-                .ConfigureServices(x =>
-                {
-                    x.AddSingleton<OrchestrationService>();
-                })
-                .Build();
+            IHost host = BuildHost(args);
 
 
             _logger = host.Services.GetRequiredService<ILogger<Program>>();
@@ -124,8 +111,6 @@ static async Task Main(string[] args)
             }, false, host.Services.GetRequiredService<ILogger<MmoServer>>(), configuration);
             workerServer.Start();
 
-            StartAPI();
-
             _logger.LogInformation("DragonGF is ready.");
 
 
@@ -137,23 +122,30 @@ static async Task Main(string[] args)
             //metricServer.Stop();
         }
 
-        private static async void StartAPI()
+
+
+        private static WebApplication BuildHost(string[] args)
         {
-            _logger.LogInformation("Starting Console API");
 
-            // 
-            var builder = WebApplication.CreateBuilder();
+            var builder = WebApplication.CreateBuilder(args);
+            builder.WebHost.UseUrls("http://*:3000");
+            builder.Logging.AddSimpleConsole(options =>
+                {
+                    options.IncludeScopes = true;
+                    options.SingleLine = true;
+                    options.TimestampFormat = "hh:mm:ss ";
+                });
+
+            builder.Services.AddSingleton<OrchestrationService>();
 
-            //
             builder.Services.AddControllers();
 
             var app = builder.Build();
-            
-            // app.UseHttpsRedirection();
+
+            //app.UseHttpsRedirection();
             app.UseAuthorization();
             app.MapControllers();
-
-            await app.RunAsync("http://localhost:3000");
+            return app;
         }
 
         public static MmoServer GetServer()

diff --git a/Mmo Game Framework/MainServer/Properties/launchSettings.json b/Mmo Game Framework/MainServer/Properties/launchSettings.json
@@ -2,6 +2,7 @@
   "profiles": {
     "MainServer": {
       "commandName": "Project",
+      "applicationUrl": "http://localhost:3000",
       "environmentVariables": {
         "DOTNET_ENVIRONMENT": "Development"
         //"AGONES_SDK_GRPC_HOST": "192.168.4.241"