From e98c625f811823b5ad528294da65e8228571ce42 Mon Sep 17 00:00:00 2001 From: Igor_Sychev Date: Thu, 28 Feb 2019 11:40:11 +0300 Subject: [PATCH] runfix --- src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj | 4 ---- src/ApiGateways/ApiGw-Base/Program.cs | 6 ++++++ src/ApiGateways/ApiGw-Base/Startup.cs | 4 +--- src/Services/Basket/Basket.API/Program.cs | 1 + src/Services/Basket/Basket.API/Startup.cs | 3 +-- src/Services/Catalog/Catalog.API/Program.cs | 1 + src/Services/Catalog/Catalog.API/Startup.cs | 3 +-- src/Services/Identity/Identity.API/Program.cs | 1 + src/Services/Identity/Identity.API/Startup.cs | 7 ++----- src/Services/Location/Locations.API/Program.cs | 1 + src/Services/Location/Locations.API/Startup.cs | 3 +-- src/Services/Marketing/Marketing.API/Program.cs | 1 + src/Services/Marketing/Marketing.API/Startup.cs | 3 +-- src/Services/Ordering/Ordering.API/Program.cs | 1 + src/Services/Ordering/Ordering.API/Startup.cs | 3 +-- .../Ordering/Ordering.SignalrHub/Program.cs | 1 + .../Ordering/Ordering.SignalrHub/Startup.cs | 3 +-- src/Services/Payment/Payment.API/Program.cs | 1 + src/Services/Payment/Payment.API/Startup.cs | 3 +-- src/Services/Webhooks/Webhooks.API/Program.cs | 13 ++++++++++++- src/Services/Webhooks/Webhooks.API/Startup.cs | 3 +-- src/Web/WebMVC/Program.cs | 1 + src/Web/WebMVC/Startup.cs | 3 +-- src/Web/WebSPA/Program.cs | 1 + src/Web/WebSPA/Startup.cs | 4 +--- src/Web/WebStatus/Program.cs | 1 + src/Web/WebStatus/Startup.cs | 3 +-- 27 files changed, 43 insertions(+), 36 deletions(-) diff --git a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj index fb6995ed8..eb88972c0 100644 --- a/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj +++ b/src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj @@ -4,10 +4,6 @@ netcoreapp2.2 - - - - diff --git a/src/ApiGateways/ApiGw-Base/Program.cs b/src/ApiGateways/ApiGw-Base/Program.cs index c8f8d7993..bcf1c8d60 100644 --- a/src/ApiGateways/ApiGw-Base/Program.cs +++ b/src/ApiGateways/ApiGw-Base/Program.cs @@ -25,6 +25,12 @@ namespace OcelotApiGw builder.ConfigureServices(s => s.AddSingleton(builder)) .ConfigureAppConfiguration(ic => ic.AddJsonFile(Path.Combine("configuration", "configuration.json"))) .UseStartup() + .ConfigureLogging((hostingContext, loggingbuilder) => + { + loggingbuilder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); + loggingbuilder.AddConsole(); + loggingbuilder.AddDebug(); + }) .UseSerilog((builderContext, config) => { config diff --git a/src/ApiGateways/ApiGw-Base/Startup.cs b/src/ApiGateways/ApiGw-Base/Startup.cs index cd90bd7ca..585c26471 100644 --- a/src/ApiGateways/ApiGw-Base/Startup.cs +++ b/src/ApiGateways/ApiGw-Base/Startup.cs @@ -76,7 +76,7 @@ namespace OcelotApiGw services.AddOcelot(_cfg); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { var pathBase = _cfg["PATH_BASE"]; @@ -101,8 +101,6 @@ namespace OcelotApiGw Predicate = r => r.Name.Contains("self") }); - loggerFactory.AddConsole(_cfg.GetSection("Logging")); - app.UseCors("CorsPolicy"); app.UseOcelot().Wait(); diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs index e4328645e..cf53c1b13 100644 --- a/src/Services/Basket/Basket.API/Program.cs +++ b/src/Services/Basket/Basket.API/Program.cs @@ -48,6 +48,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseSerilog((builderContext, config) => { diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index b4de0e092..4b9d65cc7 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -179,9 +179,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs index 3f4c19955..c4ebb6183 100644 --- a/src/Services/Catalog/Catalog.API/Program.cs +++ b/src/Services/Catalog/Catalog.API/Program.cs @@ -60,6 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseSerilog((builderContext, config) => { diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index d4372a37a..9c91a743e 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -60,11 +60,10 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API } - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { //Configure logs - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Identity/Identity.API/Program.cs b/src/Services/Identity/Identity.API/Program.cs index d06d49492..401a2b8a5 100644 --- a/src/Services/Identity/Identity.API/Program.cs +++ b/src/Services/Identity/Identity.API/Program.cs @@ -67,6 +67,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs index 3389ff449..b6e0d1390 100644 --- a/src/Services/Identity/Identity.API/Startup.cs +++ b/src/Services/Identity/Identity.API/Startup.cs @@ -116,11 +116,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) - { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerBuilder.AddDebug(); - loggerBuilder.AddAzureWebAppDiagnostics(); + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); if (env.IsDevelopment()) diff --git a/src/Services/Location/Locations.API/Program.cs b/src/Services/Location/Locations.API/Program.cs index 83c586088..11be8d68c 100644 --- a/src/Services/Location/Locations.API/Program.cs +++ b/src/Services/Location/Locations.API/Program.cs @@ -43,6 +43,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs index 343c6fdc2..f92000b84 100644 --- a/src/Services/Location/Locations.API/Startup.cs +++ b/src/Services/Location/Locations.API/Startup.cs @@ -153,9 +153,8 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Marketing/Marketing.API/Program.cs b/src/Services/Marketing/Marketing.API/Program.cs index a885a3af6..cca7f4d79 100644 --- a/src/Services/Marketing/Marketing.API/Program.cs +++ b/src/Services/Marketing/Marketing.API/Program.cs @@ -55,6 +55,7 @@ builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs index 4ffdb37ad..276a82fa9 100644 --- a/src/Services/Marketing/Marketing.API/Startup.cs +++ b/src/Services/Marketing/Marketing.API/Startup.cs @@ -177,9 +177,8 @@ } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env,ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, IHostingEnvironment env,ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Ordering/Ordering.API/Program.cs b/src/Services/Ordering/Ordering.API/Program.cs index b97ced4d4..8db59598c 100644 --- a/src/Services/Ordering/Ordering.API/Program.cs +++ b/src/Services/Ordering/Ordering.API/Program.cs @@ -59,6 +59,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 56af5cfff..03e9b1d7f 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -72,9 +72,8 @@ } - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Ordering/Ordering.SignalrHub/Program.cs b/src/Services/Ordering/Ordering.SignalrHub/Program.cs index 5ebe7ffb6..3fe2e8c24 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Program.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Program.cs @@ -26,6 +26,7 @@ namespace Ordering.SignalrHub builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseSerilog((builderContext, config) => { diff --git a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs index 68ce95b63..20f8b739b 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Startup.cs +++ b/src/Services/Ordering/Ordering.SignalrHub/Startup.cs @@ -118,9 +118,8 @@ namespace Ordering.SignalrHub public IConfiguration Configuration { get; } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Payment/Payment.API/Program.cs b/src/Services/Payment/Payment.API/Program.cs index 0b8c5e025..7a589e8a4 100644 --- a/src/Services/Payment/Payment.API/Program.cs +++ b/src/Services/Payment/Payment.API/Program.cs @@ -28,6 +28,7 @@ namespace Payment.API builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Services/Payment/Payment.API/Startup.cs b/src/Services/Payment/Payment.API/Startup.cs index 2d544b5eb..62a3b2321 100644 --- a/src/Services/Payment/Payment.API/Startup.cs +++ b/src/Services/Payment/Payment.API/Startup.cs @@ -89,9 +89,8 @@ namespace Payment.API } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Services/Webhooks/Webhooks.API/Program.cs b/src/Services/Webhooks/Webhooks.API/Program.cs index 063fe2ac1..b08a1c2da 100644 --- a/src/Services/Webhooks/Webhooks.API/Program.cs +++ b/src/Services/Webhooks/Webhooks.API/Program.cs @@ -22,6 +22,17 @@ namespace Webhooks.API public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseStartup(); + .UseStartup() + .ConfigureAppConfiguration((builderContext, config) => + { + config.AddEnvironmentVariables(); + }) + .ConfigureLogging((hostingContext, builder) => + { + builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); + builder.AddConsole(); + builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); + }); } } diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs index 29f1ebd60..654b1c897 100644 --- a/src/Services/Webhooks/Webhooks.API/Startup.cs +++ b/src/Services/Webhooks/Webhooks.API/Startup.cs @@ -70,9 +70,8 @@ namespace Webhooks.API return new AutofacServiceProvider(container.Build()); } - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); var pathBase = Configuration["PATH_BASE"]; diff --git a/src/Web/WebMVC/Program.cs b/src/Web/WebMVC/Program.cs index 7f88feeaf..5000e0422 100644 --- a/src/Web/WebMVC/Program.cs +++ b/src/Web/WebMVC/Program.cs @@ -27,6 +27,7 @@ namespace Microsoft.eShopOnContainers.WebMVC builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index dcb0b98b3..0ec33bc8c 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -48,11 +48,10 @@ namespace Microsoft.eShopOnContainers.WebMVC } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear(); - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); app.UseHealthChecks("/hc", new HealthCheckOptions() diff --git a/src/Web/WebSPA/Program.cs b/src/Web/WebSPA/Program.cs index f4a1ca1b4..bd4382603 100644 --- a/src/Web/WebSPA/Program.cs +++ b/src/Web/WebSPA/Program.cs @@ -27,6 +27,7 @@ namespace eShopConContainers.WebSPA builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs index 1ed6f39bc..5cfeb98fc 100644 --- a/src/Web/WebSPA/Startup.cs +++ b/src/Web/WebSPA/Startup.cs @@ -73,10 +73,8 @@ namespace eShopConContainers.WebSPA // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IAntiforgery antiforgery) { - - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); if (env.IsDevelopment()) diff --git a/src/Web/WebStatus/Program.cs b/src/Web/WebStatus/Program.cs index e9f5a4453..11a4f02b9 100644 --- a/src/Web/WebStatus/Program.cs +++ b/src/Web/WebStatus/Program.cs @@ -23,6 +23,7 @@ namespace WebStatus builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); builder.AddConsole(); builder.AddDebug(); + builder.AddAzureWebAppDiagnostics(); }) .UseApplicationInsights() .UseSerilog((builderContext, config) => diff --git a/src/Web/WebStatus/Startup.cs b/src/Web/WebStatus/Startup.cs index c51d3bb11..fbfa5e74c 100644 --- a/src/Web/WebStatus/Startup.cs +++ b/src/Web/WebStatus/Startup.cs @@ -37,9 +37,8 @@ namespace WebStatus } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, ILoggingBuilder loggerBuilder) + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - loggerBuilder.AddAzureWebAppDiagnostics(); loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace); if (env.IsDevelopment())