From 9c017cd8054a55a2102369c3d526383d664c07ad Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 17 Jan 2019 15:32:39 -0800 Subject: [PATCH] Move generic webhost log output, enable in templates (#6814) --- .../src/GenericHost/GenericWebHostedService.cs | 13 ++++++++----- .../content/EmptyWeb-CSharp/appsettings.json | 3 ++- .../content/EmptyWeb-FSharp/appsettings.json | 3 ++- .../appsettings.json | 3 ++- .../content/RazorPagesWeb-CSharp/appsettings.json | 3 ++- .../content/StarterWeb-CSharp/appsettings.json | 3 ++- .../content/StarterWeb-FSharp/appsettings.json | 3 ++- .../content/WebApi-CSharp/appsettings.json | 3 ++- .../content/WebApi-FSharp/appsettings.json | 3 ++- 9 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs index 8ec39059f0..a9ebccaaa0 100644 --- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs +++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal { public GenericWebHostService(IOptions options, IServer server, - ILogger logger, + ILoggerFactory loggerFactory, DiagnosticListener diagnosticListener, IHttpContextFactory httpContextFactory, IApplicationBuilderFactory applicationBuilderFactory, @@ -37,7 +37,8 @@ namespace Microsoft.AspNetCore.Hosting.Internal { Options = options.Value; Server = server; - Logger = logger; + Logger = loggerFactory.CreateLogger(); + LifetimeLogger = loggerFactory.CreateLogger("Microsoft.Hosting.Lifetime"); DiagnosticListener = diagnosticListener; HttpContextFactory = httpContextFactory; ApplicationBuilderFactory = applicationBuilderFactory; @@ -49,6 +50,8 @@ namespace Microsoft.AspNetCore.Hosting.Internal public GenericWebHostServiceOptions Options { get; } public IServer Server { get; } public ILogger Logger { get; } + // Only for high level lifetime events + public ILogger LifetimeLogger { get; } public DiagnosticListener DiagnosticListener { get; } public IHttpContextFactory HttpContextFactory { get; } public IApplicationBuilderFactory ApplicationBuilderFactory { get; } @@ -119,7 +122,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal { foreach (var address in addresses) { - Logger.LogInformation("Now listening on: {address}", address); + LifetimeLogger.LogInformation("Now listening on: {address}", address); } } @@ -198,4 +201,4 @@ namespace Microsoft.AspNetCore.Hosting.Internal } } } -} \ No newline at end of file +} diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json index def9159a7d..7cb5ac8193 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-CSharp/appsettings.json @@ -1,7 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json index def9159a7d..7cb5ac8193 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/EmptyWeb-FSharp/appsettings.json @@ -1,7 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/appsettings.json index def9159a7d..7cb5ac8193 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/appsettings.json @@ -1,7 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.json index 0f893b1b48..526319943f 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/appsettings.json @@ -33,7 +33,8 @@ //#endif "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.json index 0f893b1b48..526319943f 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/appsettings.json @@ -33,7 +33,8 @@ //#endif "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json index def9159a7d..7cb5ac8193 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/appsettings.json @@ -1,7 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/appsettings.json index 79300faae7..456da1fb8e 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/appsettings.json @@ -20,7 +20,8 @@ //#endif "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*" diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json index def9159a7d..7cb5ac8193 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/appsettings.json @@ -1,7 +1,8 @@ { "Logging": { "LogLevel": { - "Default": "Warning" + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, "AllowedHosts": "*"