HttpSys logs and samples cleanup (#17971)
This commit is contained in:
parent
b3a7e54c89
commit
c759f5b8f8
|
|
@ -74,6 +74,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueueSharing", "samples\Que
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "..\..\DefaultBuilder\src\Microsoft.AspNetCore.csproj", "{E8880B06-7172-4995-893D-13E87AF00E7B}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
|
@ -332,6 +334,18 @@ Global
|
||||||
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|x86.ActiveCfg = Release|Any CPU
|
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|x86.Build.0 = Release|Any CPU
|
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B}.Release|x86.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
@ -359,6 +373,7 @@ Global
|
||||||
{00A88B8D-D539-45DD-B071-1E955AF89A4A} = {4DA3C456-5050-4AC0-A554-795F6DEC8660}
|
{00A88B8D-D539-45DD-B071-1E955AF89A4A} = {4DA3C456-5050-4AC0-A554-795F6DEC8660}
|
||||||
{9B58DF76-DC6D-4728-86B7-40087BDDC897} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
|
{9B58DF76-DC6D-4728-86B7-40087BDDC897} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514}
|
||||||
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB} = {4DA3C456-5050-4AC0-A554-795F6DEC8660}
|
{33CF53ED-A4BC-4EAA-9EA7-EF5E748A03BB} = {4DA3C456-5050-4AC0-A554-795F6DEC8660}
|
||||||
|
{E8880B06-7172-4995-893D-13E87AF00E7B} = {4DA3C456-5050-4AC0-A554-795F6DEC8660}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {34B42B42-FA09-41AB-9216-14073990C504}
|
SolutionGuid = {34B42B42-FA09-41AB-9216-14073990C504}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
// 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 Microsoft.AspNetCore.Hosting;
|
||||||
|
using Microsoft.AspNetCore.Server.HttpSys;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
|
namespace SelfHostServer
|
||||||
|
{
|
||||||
|
public static class Program
|
||||||
|
{
|
||||||
|
public static void Main(string[] args)
|
||||||
|
{
|
||||||
|
CreateHostBuilder(args).Build().Run();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||||
|
Host.CreateDefaultBuilder(args)
|
||||||
|
.ConfigureWebHostDefaults(webBuilder =>
|
||||||
|
{
|
||||||
|
webBuilder.UseStartup<Startup>()
|
||||||
|
.UseHttpSys(options =>
|
||||||
|
{
|
||||||
|
options.UrlPrefixes.Add("http://localhost:5000");
|
||||||
|
// This is a pre-configured IIS express port. See the PackageTags in the csproj.
|
||||||
|
options.UrlPrefixes.Add("https://localhost:44319");
|
||||||
|
options.Authentication.Schemes = AuthenticationSchemes.None;
|
||||||
|
options.Authentication.AllowAnonymous = true;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -12,7 +12,9 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Reference Include="Microsoft.AspNetCore" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
|
<Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
|
||||||
|
<Reference Include="Microsoft.Extensions.Hosting" />
|
||||||
<Reference Include="Microsoft.Extensions.Logging.Console" />
|
<Reference Include="Microsoft.Extensions.Logging.Console" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
// 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;
|
using System;
|
||||||
using Microsoft.AspNetCore.Builder;
|
using Microsoft.AspNetCore.Builder;
|
||||||
using Microsoft.AspNetCore.Hosting;
|
using Microsoft.AspNetCore.Hosting;
|
||||||
|
|
@ -28,23 +31,5 @@ namespace SelfHostServer
|
||||||
await context.Response.WriteAsync("Hello world from " + context.Request.Host + " at " + DateTime.Now);
|
await context.Response.WriteAsync("Hello world from " + context.Request.Host + " at " + DateTime.Now);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Main(string[] args)
|
|
||||||
{
|
|
||||||
var host = new WebHostBuilder()
|
|
||||||
.ConfigureLogging(factory => factory.AddConsole())
|
|
||||||
.UseStartup<Startup>()
|
|
||||||
.UseHttpSys(options =>
|
|
||||||
{
|
|
||||||
options.UrlPrefixes.Add("http://localhost:5000");
|
|
||||||
// This is a pre-configured IIS express port. See the PackageTags in the csproj.
|
|
||||||
options.UrlPrefixes.Add("https://localhost:44319");
|
|
||||||
options.Authentication.Schemes = AuthenticationSchemes.None;
|
|
||||||
options.Authentication.AllowAnonymous = true;
|
|
||||||
})
|
|
||||||
.Build();
|
|
||||||
|
|
||||||
host.Run();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
{
|
{
|
||||||
CheckDisposed();
|
CheckDisposed();
|
||||||
|
|
||||||
LogHelper.LogInfo(Logger, "Start");
|
LogHelper.LogTrace(Logger, "Starting the listener.");
|
||||||
|
|
||||||
// Make sure there are no race conditions between Start/Stop/Abort/Close/Dispose.
|
// Make sure there are no race conditions between Start/Stop/Abort/Close/Dispose.
|
||||||
// Start needs to setup all resources. Abort/Stop must not interfere while Start is
|
// Start needs to setup all resources. Abort/Stop must not interfere while Start is
|
||||||
|
|
@ -195,6 +195,8 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LogHelper.LogTrace(Logger, "Stopping the listener.");
|
||||||
|
|
||||||
// If this instance created the queue then remove the URL prefixes before shutting down.
|
// If this instance created the queue then remove the URL prefixes before shutting down.
|
||||||
if (_requestQueue.Created)
|
if (_requestQueue.Created)
|
||||||
{
|
{
|
||||||
|
|
@ -236,7 +238,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LogHelper.LogInfo(Logger, "Dispose");
|
LogHelper.LogTrace(Logger, "Disposing the listener.");
|
||||||
|
|
||||||
Stop();
|
Stop();
|
||||||
DisposeInternal();
|
DisposeInternal();
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,18 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static void LogTrace(ILogger logger, string data)
|
||||||
|
{
|
||||||
|
if (logger == null)
|
||||||
|
{
|
||||||
|
Debug.WriteLine(data);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
logger.LogTrace(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal static void LogException(ILogger logger, string location, Exception exception)
|
internal static void LogException(ILogger logger, string location, Exception exception)
|
||||||
{
|
{
|
||||||
if (logger == null)
|
if (logger == null)
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
|
|
||||||
internal void RegisterPrefix(string uriPrefix, int contextId)
|
internal void RegisterPrefix(string uriPrefix, int contextId)
|
||||||
{
|
{
|
||||||
LogHelper.LogInfo(_logger, "Listening on prefix: " + uriPrefix);
|
LogHelper.LogDebug(_logger, "Listening on prefix: " + uriPrefix);
|
||||||
CheckDisposed();
|
CheckDisposed();
|
||||||
var statusCode = HttpApi.HttpAddUrlToUrlGroup(Id, uriPrefix, (ulong)contextId, 0);
|
var statusCode = HttpApi.HttpAddUrlToUrlGroup(Id, uriPrefix, (ulong)contextId, 0);
|
||||||
|
|
||||||
|
|
@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
|
||||||
|
|
||||||
internal bool UnregisterPrefix(string uriPrefix)
|
internal bool UnregisterPrefix(string uriPrefix)
|
||||||
{
|
{
|
||||||
LogHelper.LogInfo(_logger, "Stop listening on prefix: " + uriPrefix);
|
LogHelper.LogDebug(_logger, "Stop listening on prefix: " + uriPrefix);
|
||||||
CheckDisposed();
|
CheckDisposed();
|
||||||
|
|
||||||
var statusCode = HttpApi.HttpRemoveUrlFromUrlGroup(Id, uriPrefix, 0);
|
var statusCode = HttpApi.HttpRemoveUrlFromUrlGroup(Id, uriPrefix, 0);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue