This repository has been archived by the owner on Dec 18, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 527
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Make Sockets the default transport * Create separate Libuv and Sockets functional test projects * Fix functional tests that fail with Sockets * Moved OneToTenThreads test to Kestrel.Transport.Libuv.Tests * Fix systemd activation tests to use libuv transport * Dispose Sockets PipeFactory * Improve Socket's server-side abort handling * Add explicit rebinding test
- Loading branch information
Showing
31 changed files
with
525 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // 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 Microsoft.Extensions.Logging; | ||
|
|
||
| namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal | ||
| { | ||
| public interface ISocketsTrace : ILogger | ||
| { | ||
| void ConnectionReadFin(string connectionId); | ||
|
|
||
| void ConnectionWriteFin(string connectionId); | ||
|
|
||
| void ConnectionError(string connectionId, Exception ex); | ||
|
|
||
| void ConnectionReset(string connectionId); | ||
|
|
||
| void ConnectionPause(string connectionId); | ||
|
|
||
| void ConnectionResume(string connectionId); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| // 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 Microsoft.Extensions.Logging; | ||
|
|
||
| namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal | ||
| { | ||
| public class SocketsTrace : ISocketsTrace | ||
| { | ||
| // ConnectionRead: Reserved: 3 | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionPause = | ||
| LoggerMessage.Define<string>(LogLevel.Debug, 4, @"Connection id ""{ConnectionId}"" paused."); | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionResume = | ||
| LoggerMessage.Define<string>(LogLevel.Debug, 5, @"Connection id ""{ConnectionId}"" resumed."); | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionReadFin = | ||
| LoggerMessage.Define<string>(LogLevel.Debug, 6, @"Connection id ""{ConnectionId}"" received FIN."); | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionWriteFin = | ||
| LoggerMessage.Define<string>(LogLevel.Debug, 7, @"Connection id ""{ConnectionId}"" sending FIN."); | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionError = | ||
| LoggerMessage.Define<string>(LogLevel.Information, 14, @"Connection id ""{ConnectionId}"" communication error."); | ||
|
|
||
| private static readonly Action<ILogger, string, Exception> _connectionReset = | ||
| LoggerMessage.Define<string>(LogLevel.Debug, 19, @"Connection id ""{ConnectionId}"" reset."); | ||
|
|
||
| private readonly ILogger _logger; | ||
|
|
||
| public SocketsTrace(ILogger logger) | ||
| { | ||
| _logger = logger; | ||
| } | ||
|
|
||
| public void ConnectionRead(string connectionId, int count) | ||
| { | ||
| // Don't log for now since this could be *too* verbose. | ||
| // Reserved: Event ID 3 | ||
| } | ||
|
|
||
| public void ConnectionReadFin(string connectionId) | ||
| { | ||
| _connectionReadFin(_logger, connectionId, null); | ||
| } | ||
|
|
||
| public void ConnectionWriteFin(string connectionId) | ||
| { | ||
| _connectionWriteFin(_logger, connectionId, null); | ||
| } | ||
|
|
||
| public void ConnectionWrite(string connectionId, int count) | ||
| { | ||
| // Don't log for now since this could be *too* verbose. | ||
| // Reserved: Event ID 11 | ||
| } | ||
|
|
||
| public void ConnectionWriteCallback(string connectionId, int status) | ||
| { | ||
| // Don't log for now since this could be *too* verbose. | ||
| // Reserved: Event ID 12 | ||
| } | ||
|
|
||
| public void ConnectionError(string connectionId, Exception ex) | ||
| { | ||
| _connectionError(_logger, connectionId, ex); | ||
| } | ||
|
|
||
| public void ConnectionReset(string connectionId) | ||
| { | ||
| _connectionReset(_logger, connectionId, null); | ||
| } | ||
|
|
||
| public void ConnectionPause(string connectionId) | ||
| { | ||
| _connectionPause(_logger, connectionId, null); | ||
| } | ||
|
|
||
| public void ConnectionResume(string connectionId) | ||
| { | ||
| _connectionResume(_logger, connectionId, null); | ||
| } | ||
|
|
||
| public IDisposable BeginScope<TState>(TState state) => _logger.BeginScope(state); | ||
|
|
||
| public bool IsEnabled(LogLevel logLevel) => _logger.IsEnabled(logLevel); | ||
|
|
||
| public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter) | ||
| => _logger.Log(logLevel, eventId, state, exception, formatter); | ||
| } | ||
| } |
Oops, something went wrong.