Skip to content

Commit f1b0157

Browse files
davidfowldavidfowl
authored
Added missing event ids for hosting events (#31149)
- Fixed slnf file
1 parent 4b9d32a commit f1b0157

File tree

6 files changed

+52
-30
lines changed

6 files changed

+52
-30
lines changed

‎AspNetCore.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,6 +1628,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTestApp", "src\Component
16281628
EndProject
16291629
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebviewAppShared", "src\Components\WebView\Samples\WebviewAppShared\WebviewAppShared.csproj", "{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}"
16301630
EndProject
1631+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "src\Hosting\test\testassets\TestStartupAssembly1\TestStartupAssembly1.csproj", "{262FF30C-34B4-462D-B5E2-0DABB9196E40}"
1632+
EndProject
16311633
Global
16321634
GlobalSection(SolutionConfigurationPlatforms) = preSolution
16331635
Debug|Any CPU = Debug|Any CPU
@@ -7699,6 +7701,18 @@ Global
76997701
{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x64.Build.0 = Release|Any CPU
77007702
{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x86.ActiveCfg = Release|Any CPU
77017703
{64C3BAC8-C4F8-466A-9E84-0400EE54B25A}.Release|x86.Build.0 = Release|Any CPU
7704+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7705+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
7706+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.ActiveCfg = Debug|Any CPU
7707+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x64.Build.0 = Debug|Any CPU
7708+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.ActiveCfg = Debug|Any CPU
7709+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Debug|x86.Build.0 = Debug|Any CPU
7710+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
7711+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|Any CPU.Build.0 = Release|Any CPU
7712+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.ActiveCfg = Release|Any CPU
7713+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x64.Build.0 = Release|Any CPU
7714+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.ActiveCfg = Release|Any CPU
7715+
{262FF30C-34B4-462D-B5E2-0DABB9196E40}.Release|x86.Build.0 = Release|Any CPU
77027716
EndGlobalSection
77037717
GlobalSection(SolutionProperties) = preSolution
77047718
HideSolutionNode = FALSE
@@ -8503,6 +8517,7 @@ Global
85038517
{94D0D6F3-8632-41DE-908B-47A787D570FF} = {5241CF68-66A0-4724-9BAA-36DB959A5B11}
85048518
{036C6BDA-7B69-4E8C-A921-822DA5972A56} = {94D0D6F3-8632-41DE-908B-47A787D570FF}
85058519
{64C3BAC8-C4F8-466A-9E84-0400EE54B25A} = {D3B76F4E-A980-45BF-AEA1-EA3175B0B5A1}
8520+
{262FF30C-34B4-462D-B5E2-0DABB9196E40} = {C1409A8F-555A-4A88-B803-C6D3E8B6C3B0}
85068521
EndGlobalSection
85078522
GlobalSection(ExtensibilityGlobals) = postSolution
85088523
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎src/Hosting/Hosting.slnf

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
1-
{
1+
{
22
"solution": {
33
"path": "..\\..\\AspNetCore.sln",
4-
"projects" : [
4+
"projects": [
5+
"src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
6+
"src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
57
"src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
68
"src\\Hosting\\Hosting\\test\\Microsoft.AspNetCore.Hosting.Tests.csproj",
7-
"src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
8-
"src\\Hosting\\samples\\GenericWebHost\\GenericWebHost.csproj",
9-
"src\\Hosting\\samples\\SampleStartups\\SampleStartups.csproj",
109
"src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
1110
"src\\Hosting\\Server.IntegrationTesting\\src\\Microsoft.AspNetCore.Server.IntegrationTesting.csproj",
1211
"src\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj",
1312
"src\\Hosting\\TestHost\\test\\Microsoft.AspNetCore.TestHost.Tests.csproj",
1413
"src\\Hosting\\WindowsServices\\src\\Microsoft.AspNetCore.Hosting.WindowsServices.csproj",
1514
"src\\Hosting\\WindowsServices\\test\\Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj",
15+
"src\\Hosting\\samples\\GenericWebHost\\GenericWebHost.csproj",
16+
"src\\Hosting\\samples\\SampleStartups\\SampleStartups.csproj",
1617
"src\\Hosting\\test\\FunctionalTests\\Microsoft.AspNetCore.Hosting.FunctionalTests.csproj",
1718
"src\\Hosting\\test\\testassets\\IStartupInjectionAssemblyName\\IStartupInjectionAssemblyName.csproj",
18-
"src\\Hosting\\test\\testassets\\Microsoft.AspNetCore.Hosting.TestSites\\Microsoft.AspNetCore.Hosting.TestSites.csproj",
1919
"src\\Hosting\\test\\testassets\\TestStartupAssembly1\\TestStartupAssembly1.csproj",
20-
"src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
20+
"src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
2121
"src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
2222
"src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
23+
"src\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
2324
"src\\Http\\Http\\src\\Microsoft.AspNetCore.Http.csproj",
24-
"src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
25-
"src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
2625
"src\\Http\\Owin\\src\\Microsoft.AspNetCore.Owin.csproj",
27-
"src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
26+
"src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
27+
"src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
28+
"src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
2829
"src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
30+
"src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
2931
"src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
30-
"src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
31-
"src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj"
32+
"src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
3233
]
3334
}
34-
}
35+
}

‎src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,16 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.Linq;
8-
using System.Reflection;
9-
using System.Runtime.InteropServices;
108
using System.Threading;
119
using System.Threading.Tasks;
12-
using Microsoft.AspNetCore.Builder;
1310
using Microsoft.AspNetCore.Hosting.Builder;
1411
using Microsoft.AspNetCore.Hosting.Server;
1512
using Microsoft.AspNetCore.Hosting.Server.Features;
16-
using Microsoft.AspNetCore.Hosting.Views;
1713
using Microsoft.AspNetCore.Http;
1814
using Microsoft.Extensions.Configuration;
19-
using Microsoft.Extensions.FileProviders;
2015
using Microsoft.Extensions.Hosting;
2116
using Microsoft.Extensions.Logging;
2217
using Microsoft.Extensions.Options;
23-
using Microsoft.Extensions.StackTrace.Sources;
24-
using Microsoft.Net.Http.Headers;
2518

2619
namespace Microsoft.AspNetCore.Hosting
2720
{
@@ -126,15 +119,15 @@ public async Task StartAsync(CancellationToken cancellationToken)
126119
{
127120
foreach (var address in addresses)
128121
{
129-
LifetimeLogger.LogInformation("Now listening on: {address}", address);
122+
LifetimeLogger.ListeningOnAddress(address);
130123
}
131124
}
132125

133126
if (Logger.IsEnabled(LogLevel.Debug))
134127
{
135128
foreach (var assembly in Options.WebHostOptions.GetFinalHostingStartupAssemblies())
136129
{
137-
Logger.LogDebug("Loaded hosting startup assembly {assemblyName}", assembly);
130+
Logger.StartupAssemblyLoaded(assembly);
138131
}
139132
}
140133

‎src/Hosting/Hosting/src/Internal/HostingLoggerExtensions.cs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,27 @@ namespace Microsoft.AspNetCore.Hosting
1313
{
1414
internal static class HostingLoggerExtensions
1515
{
16+
private static readonly Action<ILogger, string, Exception?> _startupAssemblyLoaded =
17+
LoggerMessage.Define<string>(LogLevel.Debug, LoggerEventIds.HostingStartupAssemblyLoaded, "Loaded hosting startup assembly {assemblyName}");
18+
19+
private static readonly Action<ILogger, string, Exception?> _listeningOnAddress =
20+
LoggerMessage.Define<string>(LogLevel.Information, LoggerEventIds.ServerListeningOnAddresses, "Now listening on: {address}");
21+
1622
public static IDisposable RequestScope(this ILogger logger, HttpContext httpContext)
1723
{
1824
return logger.BeginScope(new HostingLogScope(httpContext));
1925
}
2026

27+
public static void ListeningOnAddress(this ILogger logger, string address)
28+
{
29+
_listeningOnAddress(logger, address, null);
30+
}
31+
32+
public static void StartupAssemblyLoaded(this ILogger logger, string assemblyName)
33+
{
34+
_startupAssemblyLoaded(logger, assemblyName, null);
35+
}
36+
2137
public static void ApplicationError(this ILogger logger, Exception exception)
2238
{
2339
logger.ApplicationError(
@@ -130,8 +146,8 @@ public KeyValuePair<string, object> this[int index]
130146
public HostingLogScope(HttpContext httpContext)
131147
{
132148
_traceIdentifier = httpContext.TraceIdentifier;
133-
_path = (httpContext.Request.PathBase.HasValue
134-
? httpContext.Request.PathBase + httpContext.Request.Path
149+
_path = (httpContext.Request.PathBase.HasValue
150+
? httpContext.Request.PathBase + httpContext.Request.Path
135151
: httpContext.Request.Path).ToString();
136152
}
137153

‎src/Hosting/Hosting/src/Internal/LoggerEventIds.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ internal static class LoggerEventIds
1818
public static readonly EventId HostedServiceStopException = new EventId(10, "HostedServiceStopException");
1919
public static readonly EventId HostingStartupAssemblyException = new EventId(11, "HostingStartupAssemblyException");
2020
public static readonly EventId ServerShutdownException = new EventId(12, "ServerShutdownException");
21+
public static readonly EventId HostingStartupAssemblyLoaded = new EventId(13, "HostingStartupAssemblyLoaded");
22+
public static readonly EventId ServerListeningOnAddresses = new EventId(14, "ServerListeningOnAddresses");
2123
}
2224
}

‎src/Hosting/Hosting/src/Internal/WebHost.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,20 @@
66
using System.Diagnostics;
77
using System.Diagnostics.CodeAnalysis;
88
using System.Linq;
9-
using System.Reflection;
109
using System.Runtime.ExceptionServices;
11-
using System.Runtime.InteropServices;
1210
using System.Threading;
1311
using System.Threading.Tasks;
1412
using Microsoft.AspNetCore.Builder;
1513
using Microsoft.AspNetCore.Hosting.Builder;
1614
using Microsoft.AspNetCore.Hosting.Server;
1715
using Microsoft.AspNetCore.Hosting.Server.Features;
18-
using Microsoft.AspNetCore.Hosting.Views;
1916
using Microsoft.AspNetCore.Http;
2017
using Microsoft.AspNetCore.Http.Features;
2118
using Microsoft.Extensions.Configuration;
2219
using Microsoft.Extensions.DependencyInjection;
2320
using Microsoft.Extensions.Hosting;
2421
using Microsoft.Extensions.Logging;
2522
using Microsoft.Extensions.Logging.Abstractions;
26-
using Microsoft.Extensions.StackTrace.Sources;
27-
using Microsoft.Net.Http.Headers;
2823

2924
namespace Microsoft.AspNetCore.Hosting
3025
{
@@ -176,7 +171,7 @@ public virtual async Task StartAsync(CancellationToken cancellationToken = defau
176171
{
177172
foreach (var assembly in _options.GetFinalHostingStartupAssemblies())
178173
{
179-
_logger.LogDebug("Loaded hosting startup assembly {assemblyName}", assembly);
174+
_logger.StartupAssemblyLoaded(assembly);
180175
}
181176
}
182177

0 commit comments

Comments
 (0)