fix aspnet hosting and logging

Azure-Samples · Sep 24, 2020 · 6a7d252 · 6a7d252
1 parent bb97339
commit 6a7d252
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 53 deletions.
diff --git a/src/GettingStartedApplication/StatefulBackendService/Startup.cs b/src/GettingStartedApplication/StatefulBackendService/Startup.cs
@@ -33,15 +33,16 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, IServiceCollection factory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            factory.AddLogging(options =>
+            if (env.IsDevelopment())
             {
-                options.AddConfiguration(this.Configuration.GetSection("Logging"));
-                options.AddConsole();
-                options.AddDebug();
-
-            });
+                app.UseDeveloperExceptionPage();
+            }
+            else
+            {
+                app.UseExceptionHandler("/Home/Error");
+            }
 
             app.UseMvc();
         }

diff --git a/src/GettingStartedApplication/StatefulBackendService/StatefulBackendService.cs b/src/GettingStartedApplication/StatefulBackendService/StatefulBackendService.cs
@@ -10,6 +10,7 @@ namespace StatefulBackendService
     using System.IO;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Logging;
     using Microsoft.ServiceFabric.Data;
     using Microsoft.ServiceFabric.Services.Communication.AspNetCore;
     using Microsoft.ServiceFabric.Services.Communication.Runtime;
@@ -43,6 +44,12 @@ protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListe
 
                                 return new WebHostBuilder()
                                     .UseKestrel()
+                                    .ConfigureLogging(logging =>
+                                    {
+                                        logging.ClearProviders();
+                                        logging.AddConsole();
+                                        logging.AddDebug();
+                                    })
                                     .ConfigureServices(
                                         services => services
                                             .AddSingleton<IReliableStateManager>(this.StateManager)

diff --git a/src/GettingStartedApplication/StatefulBackendService/StatefulBackendService.csproj b/src/GettingStartedApplication/StatefulBackendService/StatefulBackendService.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />

diff --git a/src/GettingStartedApplication/StatefulBackendService/web.config b/src/GettingStartedApplication/StatefulBackendService/web.config
diff --git a/src/GettingStartedApplication/WebService/Startup.cs b/src/GettingStartedApplication/WebService/Startup.cs
@@ -7,10 +7,11 @@ namespace WebService
 {
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.Internal;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
-    using Microsoft.Extensions.Logging.Console;
+
 
     public class Startup
     {
@@ -31,34 +32,23 @@ public void ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             services.AddMvc();
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, IServiceCollection factory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            factory.AddLogging(options =>
-            {
-                options.AddConfiguration(this.Configuration.GetSection("Logging"));
-                options.AddConsole();
-                options.AddDebug();
-                
-            });
-
-            //loggerFactory.AddConsole(this.Configuration.GetSection("Logging"));
-            //loggerFactory.AddDebug();
 
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseBrowserLink();
             }
             else
             {
                 app.UseExceptionHandler("/Home/Error");
             }
 
             app.UseStaticFiles();
-
             app.UseMvc(
                 routes =>
                 {

diff --git a/src/GettingStartedApplication/WebService/WebService.cs b/src/GettingStartedApplication/WebService/WebService.cs
@@ -11,6 +11,7 @@ namespace WebService
     using System.Net.Http;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Logging;
     using Microsoft.ServiceFabric.Services.Communication.AspNetCore;
     using Microsoft.ServiceFabric.Services.Communication.Runtime;
     using Microsoft.ServiceFabric.Services.Runtime;
@@ -35,15 +36,21 @@ protected override IEnumerable<ServiceInstanceListener> CreateServiceInstanceLis
             {
                 new ServiceInstanceListener(
                     serviceContext =>
-                        new WebListenerCommunicationListener(
+                        new HttpSysCommunicationListener(
                             serviceContext,
                             "ServiceEndpoint",
                             (url, listener) =>
                             {
-                                ServiceEventSource.Current.ServiceMessage(serviceContext, $"Starting WebListener on {url}");
+                                ServiceEventSource.Current.ServiceMessage(serviceContext, $"Starting HttpSysListener on {url}");
 
                                 return new WebHostBuilder()
-                                    .UseWebListener()
+                                    .UseHttpSys()
+                                    .ConfigureLogging(logging =>
+                                    {
+                                        logging.ClearProviders();
+                                        logging.AddConsole();
+                                        logging.AddDebug();
+                                    })
                                     .ConfigureServices(
                                         services => services
                                             .AddSingleton<ConfigSettings>(new ConfigSettings(serviceContext))

diff --git a/src/GettingStartedApplication/WebService/WebService.csproj b/src/GettingStartedApplication/WebService/WebService.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.8" />
     <PackageReference Include="Microsoft.ServiceFabric" Version="7.1.458" />
     <PackageReference Include="Microsoft.ServiceFabric.Actors" Version="4.1.458" />
-    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.WebListener" Version="4.1.458" />
+    <PackageReference Include="Microsoft.ServiceFabric.AspNetCore.HttpSys" Version="4.1.458" />
     <PackageReference Include="Microsoft.ServiceFabric.Data" Version="4.1.458" />
     <PackageReference Include="Microsoft.ServiceFabric.Services" Version="4.1.458" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />

diff --git a/src/GettingStartedApplication/WebService/web.config b/src/GettingStartedApplication/WebService/web.config