huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log when WebSocketTransport has started (#2752)

This commit is contained in:
BrennanConroy 2018-08-10 09:49:17 -07:00 committed by Andrew Stanton-Nurse
parent da35d1f4e1
commit b82fcc0b21
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs
View File

@ -66,6 +66,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
private static readonly Action<ILogger, Exception> _cancelMessage = private static readonly Action<ILogger, Exception> _cancelMessage =
LoggerMessage.Define(LogLevel.Debug, new EventId(18, "CancelMessage"), "Canceled passing message to application."); LoggerMessage.Define(LogLevel.Debug, new EventId(18, "CancelMessage"), "Canceled passing message to application.");
private static readonly Action<ILogger, Exception> _startedTransport =
LoggerMessage.Define(LogLevel.Debug, new EventId(19, "StartedTransport"), "Started transport.");
public static void StartTransport(ILogger logger, TransferFormat transferFormat, Uri webSocketUrl) public static void StartTransport(ILogger logger, TransferFormat transferFormat, Uri webSocketUrl)
{ {
_startTransport(logger, transferFormat, webSocketUrl, null); _startTransport(logger, transferFormat, webSocketUrl, null);
@ -155,6 +158,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
{ {
_cancelMessage(logger, null); _cancelMessage(logger, null);
} }
public static void StartedTransport(ILogger logger)
{
_startedTransport(logger, null);
}
} }
} }
} }

6
src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs
View File

@ -107,8 +107,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
var resolvedUrl = ResolveWebSocketsUrl(url); var resolvedUrl = ResolveWebSocketsUrl(url);
Log.StartTransport(_logger, transferFormat, resolvedUrl);
// We don't need to capture to a local because we never change this delegate. // We don't need to capture to a local because we never change this delegate.
if (_accessTokenProvider != null) if (_accessTokenProvider != null)
{ {
@ -119,8 +117,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Client.Internal
} }
} }
Log.StartTransport(_logger, transferFormat, resolvedUrl);
await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None); await _webSocket.ConnectAsync(resolvedUrl, CancellationToken.None);
Log.StartedTransport(_logger);
// Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa) // Create the pipe pair (Application's writer is connected to Transport's reader, and vice versa)
var options = ClientPipeOptions.DefaultOptions; var options = ClientPipeOptions.DefaultOptions;
var pair = DuplexPipe.CreateConnectionPair(options, options); var pair = DuplexPipe.CreateConnectionPair(options, options);