From c640f422e02f56c346ff8c03b62fd664d4f0358c Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Fri, 16 Mar 2018 12:13:27 -0700 Subject: [PATCH] Pascal case formatted log parameter names (#1615) --- .../HubConnection.Log.cs | 56 +++++++++---------- .../InvocationRequest.cs | 14 ++--- .../HubConnectionContext.cs | 2 +- .../HubEndPoint.cs | 2 +- .../Internal/DefaultHubDispatcher.Log.cs | 26 ++++----- .../Internal/RedisLoggerExtensions.cs | 10 ++-- .../HttpConnection.Log.cs | 20 +++---- .../LongPollingTransport.Log.cs | 4 +- .../SendUtils.cs | 4 +- .../ServerSentEventsTransport.Log.cs | 6 +- .../WebSocketsTransport.Log.cs | 10 ++-- .../HttpConnectionDispatcher.Log.cs | 12 ++-- .../Internal/SocketLoggerExtensions.cs | 12 ++-- .../Transports/LongPollingTransport.cs | 2 +- .../Transports/ServerSentEventsTransport.cs | 2 +- .../Transports/WebSocketsTransport.Log.cs | 8 +-- 16 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.Log.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.Log.cs index ab6ad99ea0..ff7d4cd2e3 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.Log.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.Log.cs @@ -12,34 +12,34 @@ namespace Microsoft.AspNetCore.SignalR.Client private static class Log { private static readonly Action _preparingNonBlockingInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(1, "PreparingNonBlockingInvocation"), "Preparing non-blocking invocation of '{target}', with {argumentCount} argument(s)."); + LoggerMessage.Define(LogLevel.Trace, new EventId(1, "PreparingNonBlockingInvocation"), "Preparing non-blocking invocation of '{Target}', with {ArgumentCount} argument(s)."); private static readonly Action _preparingBlockingInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(2, "PreparingBlockingInvocation"), "Preparing blocking invocation '{invocationId}' of '{target}', with return type '{returnType}' and {argumentCount} argument(s)."); + LoggerMessage.Define(LogLevel.Trace, new EventId(2, "PreparingBlockingInvocation"), "Preparing blocking invocation '{InvocationId}' of '{Target}', with return type '{ReturnType}' and {ArgumentCount} argument(s)."); private static readonly Action _registerInvocation = - LoggerMessage.Define(LogLevel.Debug, new EventId(3, "RegisterInvocation"), "Registering Invocation ID '{invocationId}' for tracking."); + LoggerMessage.Define(LogLevel.Debug, new EventId(3, "RegisterInvocation"), "Registering Invocation ID '{InvocationId}' for tracking."); private static readonly Action _issueInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(4, "IssueInvocation"), "Issuing Invocation '{invocationId}': {returnType} {methodName}({args})."); + LoggerMessage.Define(LogLevel.Trace, new EventId(4, "IssueInvocation"), "Issuing Invocation '{InvocationId}': {ReturnType} {MethodName}({Args})."); private static readonly Action _sendInvocation = - LoggerMessage.Define(LogLevel.Debug, new EventId(5, "SendInvocation"), "Sending Invocation '{invocationId}'."); + LoggerMessage.Define(LogLevel.Debug, new EventId(5, "SendInvocation"), "Sending Invocation '{InvocationId}'."); private static readonly Action _sendInvocationCompleted = - LoggerMessage.Define(LogLevel.Debug, new EventId(6, "SendInvocationCompleted"), "Sending Invocation '{invocationId}' completed."); + LoggerMessage.Define(LogLevel.Debug, new EventId(6, "SendInvocationCompleted"), "Sending Invocation '{InvocationId}' completed."); private static readonly Action _sendInvocationFailed = - LoggerMessage.Define(LogLevel.Error, new EventId(7, "SendInvocationFailed"), "Sending Invocation '{invocationId}' failed."); + LoggerMessage.Define(LogLevel.Error, new EventId(7, "SendInvocationFailed"), "Sending Invocation '{InvocationId}' failed."); private static readonly Action _receivedInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(8, "ReceivedInvocation"), "Received Invocation '{invocationId}': {methodName}({args})."); + LoggerMessage.Define(LogLevel.Trace, new EventId(8, "ReceivedInvocation"), "Received Invocation '{InvocationId}': {MethodName}({Args})."); private static readonly Action _dropCompletionMessage = - LoggerMessage.Define(LogLevel.Warning, new EventId(9, "DropCompletionMessage"), "Dropped unsolicited Completion message for invocation '{invocationId}'."); + LoggerMessage.Define(LogLevel.Warning, new EventId(9, "DropCompletionMessage"), "Dropped unsolicited Completion message for invocation '{InvocationId}'."); private static readonly Action _dropStreamMessage = - LoggerMessage.Define(LogLevel.Warning, new EventId(10, "DropStreamMessage"), "Dropped unsolicited StreamItem message for invocation '{invocationId}'."); + LoggerMessage.Define(LogLevel.Warning, new EventId(10, "DropStreamMessage"), "Dropped unsolicited StreamItem message for invocation '{InvocationId}'."); private static readonly Action _shutdownConnection = LoggerMessage.Define(LogLevel.Trace, new EventId(11, "ShutdownConnection"), "Shutting down connection."); @@ -48,43 +48,43 @@ namespace Microsoft.AspNetCore.SignalR.Client LoggerMessage.Define(LogLevel.Error, new EventId(12, "ShutdownWithError"), "Connection is shutting down due to an error."); private static readonly Action _removeInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(13, "RemoveInvocation"), "Removing pending invocation {invocationId}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(13, "RemoveInvocation"), "Removing pending invocation {InvocationId}."); private static readonly Action _missingHandler = - LoggerMessage.Define(LogLevel.Warning, new EventId(14, "MissingHandler"), "Failed to find handler for '{target}' method."); + LoggerMessage.Define(LogLevel.Warning, new EventId(14, "MissingHandler"), "Failed to find handler for '{Target}' method."); private static readonly Action _receivedStreamItem = - LoggerMessage.Define(LogLevel.Trace, new EventId(15, "ReceivedStreamItem"), "Received StreamItem for Invocation {invocationId}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(15, "ReceivedStreamItem"), "Received StreamItem for Invocation {InvocationId}."); private static readonly Action _cancelingStreamItem = - LoggerMessage.Define(LogLevel.Trace, new EventId(16, "CancelingStreamItem"), "Canceling dispatch of StreamItem message for Invocation {invocationId}. The invocation was canceled."); + LoggerMessage.Define(LogLevel.Trace, new EventId(16, "CancelingStreamItem"), "Canceling dispatch of StreamItem message for Invocation {InvocationId}. The invocation was canceled."); private static readonly Action _receivedStreamItemAfterClose = - LoggerMessage.Define(LogLevel.Warning, new EventId(17, "ReceivedStreamItemAfterClose"), "Invocation {invocationId} received stream item after channel was closed."); + LoggerMessage.Define(LogLevel.Warning, new EventId(17, "ReceivedStreamItemAfterClose"), "Invocation {InvocationId} received stream item after channel was closed."); private static readonly Action _receivedInvocationCompletion = - LoggerMessage.Define(LogLevel.Trace, new EventId(18, "ReceivedInvocationCompletion"), "Received Completion for Invocation {invocationId}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(18, "ReceivedInvocationCompletion"), "Received Completion for Invocation {InvocationId}."); private static readonly Action _cancelingInvocationCompletion = - LoggerMessage.Define(LogLevel.Trace, new EventId(19, "CancelingInvocationCompletion"), "Canceling dispatch of Completion message for Invocation {invocationId}. The invocation was canceled."); + LoggerMessage.Define(LogLevel.Trace, new EventId(19, "CancelingInvocationCompletion"), "Canceling dispatch of Completion message for Invocation {InvocationId}. The invocation was canceled."); private static readonly Action _cancelingCompletion = - LoggerMessage.Define(LogLevel.Trace, new EventId(20, "CancelingCompletion"), "Canceling dispatch of Completion message for Invocation {invocationId}. The invocation was canceled."); + LoggerMessage.Define(LogLevel.Trace, new EventId(20, "CancelingCompletion"), "Canceling dispatch of Completion message for Invocation {InvocationId}. The invocation was canceled."); private static readonly Action _invokeAfterTermination = - LoggerMessage.Define(LogLevel.Error, new EventId(21, "InvokeAfterTermination"), "Invoke for Invocation '{invocationId}' was called after the connection was terminated."); + LoggerMessage.Define(LogLevel.Error, new EventId(21, "InvokeAfterTermination"), "Invoke for Invocation '{InvocationId}' was called after the connection was terminated."); private static readonly Action _invocationAlreadyInUse = - LoggerMessage.Define(LogLevel.Critical, new EventId(22, "InvocationAlreadyInUse"), "Invocation ID '{invocationId}' is already in use."); + LoggerMessage.Define(LogLevel.Critical, new EventId(22, "InvocationAlreadyInUse"), "Invocation ID '{InvocationId}' is already in use."); private static readonly Action _receivedUnexpectedResponse = - LoggerMessage.Define(LogLevel.Error, new EventId(23, "ReceivedUnexpectedResponse"), "Unsolicited response received for invocation '{invocationId}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(23, "ReceivedUnexpectedResponse"), "Unsolicited response received for invocation '{InvocationId}'."); private static readonly Action _hubProtocol = - LoggerMessage.Define(LogLevel.Information, new EventId(24, "HubProtocol"), "Using HubProtocol '{protocol}'."); + LoggerMessage.Define(LogLevel.Information, new EventId(24, "HubProtocol"), "Using HubProtocol '{Protocol}'."); private static readonly Action _preparingStreamingInvocation = - LoggerMessage.Define(LogLevel.Trace, new EventId(25, "PreparingStreamingInvocation"), "Preparing streaming invocation '{invocationId}' of '{target}', with return type '{returnType}' and {argumentCount} argument(s)."); + LoggerMessage.Define(LogLevel.Trace, new EventId(25, "PreparingStreamingInvocation"), "Preparing streaming invocation '{InvocationId}' of '{Target}', with return type '{ReturnType}' and {ArgumentCount} argument(s)."); private static readonly Action _resettingKeepAliveTimer = LoggerMessage.Define(LogLevel.Trace, new EventId(26, "ResettingKeepAliveTimer"), "Resetting keep-alive timer, received a message from the server."); @@ -96,22 +96,22 @@ namespace Microsoft.AspNetCore.SignalR.Client LoggerMessage.Define(LogLevel.Debug, new EventId(28, "SendingHubNegotiate"), "Sending Hub Negotiation."); private static readonly Action _parsingMessages = - LoggerMessage.Define(LogLevel.Debug, new EventId(29, "ParsingMessages"), "Received {count} bytes. Parsing message(s)."); + LoggerMessage.Define(LogLevel.Debug, new EventId(29, "ParsingMessages"), "Received {Count} bytes. Parsing message(s)."); private static readonly Action _receivingMessages = - LoggerMessage.Define(LogLevel.Debug, new EventId(30, "ReceivingMessages"), "Received {messageCount} message(s)."); + LoggerMessage.Define(LogLevel.Debug, new EventId(30, "ReceivingMessages"), "Received {MessageCount} message(s)."); private static readonly Action _receivedPing = LoggerMessage.Define(LogLevel.Trace, new EventId(31, "ReceivedPing"), "Received a ping message."); private static readonly Action _processedMessages = - LoggerMessage.Define(LogLevel.Debug, new EventId(32, "ProcessedMessages"), "Finished processing {messageCount} message(s)."); + LoggerMessage.Define(LogLevel.Debug, new EventId(32, "ProcessedMessages"), "Finished processing {MessageCount} message(s)."); private static readonly Action _failedParsing = - LoggerMessage.Define(LogLevel.Warning, new EventId(33, "FailedParsing"), "No messages parsed from {count} byte(s)."); + LoggerMessage.Define(LogLevel.Warning, new EventId(33, "FailedParsing"), "No messages parsed from {Count} byte(s)."); private static readonly Action _errorInvokingClientSideMethod = - LoggerMessage.Define(LogLevel.Error, new EventId(34, "ErrorInvokingClientSideMethod"), "Invoking client side method '{methodName}' failed."); + LoggerMessage.Define(LogLevel.Error, new EventId(34, "ErrorInvokingClientSideMethod"), "Invoking client side method '{MethodName}' failed."); public static void PreparingNonBlockingInvocation(ILogger logger, string target, int count) { diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/InvocationRequest.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/InvocationRequest.cs index 7d6054bed1..1e935cc075 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/InvocationRequest.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/InvocationRequest.cs @@ -173,27 +173,27 @@ namespace Microsoft.AspNetCore.SignalR.Client { // Category: Streaming and NonStreaming private static readonly Action _invocationCreated = - LoggerMessage.Define(LogLevel.Trace, new EventId(1, "InvocationCreated"), "Invocation {invocationId} created."); + LoggerMessage.Define(LogLevel.Trace, new EventId(1, "InvocationCreated"), "Invocation {InvocationId} created."); private static readonly Action _invocationDisposed = - LoggerMessage.Define(LogLevel.Trace, new EventId(2, "InvocationDisposed"), "Invocation {invocationId} disposed."); + LoggerMessage.Define(LogLevel.Trace, new EventId(2, "InvocationDisposed"), "Invocation {InvocationId} disposed."); private static readonly Action _invocationCompleted = - LoggerMessage.Define(LogLevel.Trace, new EventId(3, "InvocationCompleted"), "Invocation {invocationId} marked as completed."); + LoggerMessage.Define(LogLevel.Trace, new EventId(3, "InvocationCompleted"), "Invocation {InvocationId} marked as completed."); private static readonly Action _invocationFailed = - LoggerMessage.Define(LogLevel.Trace, new EventId(4, "InvocationFailed"), "Invocation {invocationId} marked as failed."); + LoggerMessage.Define(LogLevel.Trace, new EventId(4, "InvocationFailed"), "Invocation {InvocationId} marked as failed."); // Category: Streaming private static readonly Action _errorWritingStreamItem = - LoggerMessage.Define(LogLevel.Error, new EventId(5, "ErrorWritingStreamItem"), "Invocation {invocationId} caused an error trying to write a stream item."); + LoggerMessage.Define(LogLevel.Error, new EventId(5, "ErrorWritingStreamItem"), "Invocation {InvocationId} caused an error trying to write a stream item."); private static readonly Action _receivedUnexpectedComplete = - LoggerMessage.Define(LogLevel.Error, new EventId(6, "ReceivedUnexpectedComplete"), "Invocation {invocationId} received a completion result, but was invoked as a streaming invocation."); + LoggerMessage.Define(LogLevel.Error, new EventId(6, "ReceivedUnexpectedComplete"), "Invocation {InvocationId} received a completion result, but was invoked as a streaming invocation."); // Category: NonStreaming private static readonly Action _streamItemOnNonStreamInvocation = - LoggerMessage.Define(LogLevel.Error, new EventId(5, "StreamItemOnNonStreamInvocation"), "Invocation {invocationId} received stream item but was invoked as a non-streamed invocation."); + LoggerMessage.Define(LogLevel.Error, new EventId(5, "StreamItemOnNonStreamInvocation"), "Invocation {InvocationId} received stream item but was invoked as a non-streamed invocation."); public static void InvocationCreated(ILogger logger, string invocationId) { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs index c07d8b4280..f4e007dc49 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs @@ -258,7 +258,7 @@ namespace Microsoft.AspNetCore.SignalR { // Category: HubConnectionContext private static readonly Action _usingHubProtocol = - LoggerMessage.Define(LogLevel.Information, new EventId(1, "UsingHubProtocol"), "Using HubProtocol '{protocol}'."); + LoggerMessage.Define(LogLevel.Information, new EventId(1, "UsingHubProtocol"), "Using HubProtocol '{Protocol}'."); private static readonly Action _negotiateCanceled = LoggerMessage.Define(LogLevel.Debug, new EventId(2, "NegotiateCanceled"), "Negotiate was canceled."); diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs index f32c39aad0..926de349d9 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs @@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.SignalR private static class Log { private static readonly Action _errorDispatchingHubEvent = - LoggerMessage.Define(LogLevel.Error, new EventId(1, "ErrorDispatchingHubEvent"), "Error when dispatching '{hubMethod}' on hub."); + LoggerMessage.Define(LogLevel.Error, new EventId(1, "ErrorDispatchingHubEvent"), "Error when dispatching '{HubMethod}' on hub."); private static readonly Action _errorProcessingRequest = LoggerMessage.Define(LogLevel.Error, new EventId(2, "ErrorProcessingRequest"), "Error when processing requests."); diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubDispatcher.Log.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubDispatcher.Log.cs index 4c23888b1f..c4aa4ec16c 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubDispatcher.Log.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubDispatcher.Log.cs @@ -13,49 +13,49 @@ namespace Microsoft.AspNetCore.SignalR.Internal private static class Log { private static readonly Action _receivedHubInvocation = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ReceivedHubInvocation"), "Received hub invocation: {invocationMessage}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ReceivedHubInvocation"), "Received hub invocation: {InvocationMessage}."); private static readonly Action _unsupportedMessageReceived = - LoggerMessage.Define(LogLevel.Error, new EventId(2, "UnsupportedMessageReceived"), "Received unsupported message of type '{messageType}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(2, "UnsupportedMessageReceived"), "Received unsupported message of type '{MessageType}'."); private static readonly Action _unknownHubMethod = - LoggerMessage.Define(LogLevel.Error, new EventId(3, "UnknownHubMethod"), "Unknown hub method '{hubMethod}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(3, "UnknownHubMethod"), "Unknown hub method '{HubMethod}'."); private static readonly Action _outboundChannelClosed = LoggerMessage.Define(LogLevel.Warning, new EventId(4, "OutboundChannelClosed"), "Outbound channel was closed while trying to write hub message."); private static readonly Action _hubMethodNotAuthorized = - LoggerMessage.Define(LogLevel.Debug, new EventId(5, "HubMethodNotAuthorized"), "Failed to invoke '{hubMethod}' because user is unauthorized."); + LoggerMessage.Define(LogLevel.Debug, new EventId(5, "HubMethodNotAuthorized"), "Failed to invoke '{HubMethod}' because user is unauthorized."); private static readonly Action _streamingResult = - LoggerMessage.Define(LogLevel.Trace, new EventId(6, "StreamingResult"), "InvocationId {invocationId}: Streaming result of type '{resultType}'."); + LoggerMessage.Define(LogLevel.Trace, new EventId(6, "StreamingResult"), "InvocationId {InvocationId}: Streaming result of type '{ResultType}'."); private static readonly Action _sendingResult = - LoggerMessage.Define(LogLevel.Trace, new EventId(7, "SendingResult"), "InvocationId {invocationId}: Sending result of type '{resultType}'."); + LoggerMessage.Define(LogLevel.Trace, new EventId(7, "SendingResult"), "InvocationId {InvocationId}: Sending result of type '{ResultType}'."); private static readonly Action _failedInvokingHubMethod = - LoggerMessage.Define(LogLevel.Error, new EventId(8, "FailedInvokingHubMethod"), "Failed to invoke hub method '{hubMethod}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(8, "FailedInvokingHubMethod"), "Failed to invoke hub method '{HubMethod}'."); private static readonly Action _hubMethodBound = - LoggerMessage.Define(LogLevel.Trace, new EventId(9, "HubMethodBound"), "'{hubName}' hub method '{hubMethod}' is bound."); + LoggerMessage.Define(LogLevel.Trace, new EventId(9, "HubMethodBound"), "'{HubName}' hub method '{HubMethod}' is bound."); private static readonly Action _cancelStream = - LoggerMessage.Define(LogLevel.Debug, new EventId(10, "CancelStream"), "Canceling stream for invocation {invocationId}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(10, "CancelStream"), "Canceling stream for invocation {InvocationId}."); private static readonly Action _unexpectedCancel = LoggerMessage.Define(LogLevel.Debug, new EventId(11, "UnexpectedCancel"), "CancelInvocationMessage received unexpectedly."); private static readonly Action _receivedStreamHubInvocation = - LoggerMessage.Define(LogLevel.Debug, new EventId(12, "ReceivedStreamHubInvocation"), "Received stream hub invocation: {invocationMessage}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(12, "ReceivedStreamHubInvocation"), "Received stream hub invocation: {InvocationMessage}."); private static readonly Action _streamingMethodCalledWithInvoke = - LoggerMessage.Define(LogLevel.Error, new EventId(13, "StreamingMethodCalledWithInvoke"), "A streaming method was invoked in the non-streaming fashion : {invocationMessage}."); + LoggerMessage.Define(LogLevel.Error, new EventId(13, "StreamingMethodCalledWithInvoke"), "A streaming method was invoked in the non-streaming fashion : {InvocationMessage}."); private static readonly Action _nonStreamingMethodCalledWithStream = - LoggerMessage.Define(LogLevel.Error, new EventId(14, "NonStreamingMethodCalledWithStream"), "A non-streaming method was invoked in the streaming fashion : {invocationMessage}."); + LoggerMessage.Define(LogLevel.Error, new EventId(14, "NonStreamingMethodCalledWithStream"), "A non-streaming method was invoked in the streaming fashion : {InvocationMessage}."); private static readonly Action _invalidReturnValueFromStreamingMethod = - LoggerMessage.Define(LogLevel.Error, new EventId(15, "InvalidReturnValueFromStreamingMethod"), "A streaming method returned a value that cannot be used to build enumerator {hubMethod}."); + LoggerMessage.Define(LogLevel.Error, new EventId(15, "InvalidReturnValueFromStreamingMethod"), "A streaming method returned a value that cannot be used to build enumerator {HubMethod}."); public static void ReceivedHubInvocation(ILogger logger, InvocationMessage invocationMessage) { diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/Internal/RedisLoggerExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Redis/Internal/RedisLoggerExtensions.cs index cb6e089045..19e9791072 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/Internal/RedisLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.SignalR.Redis/Internal/RedisLoggerExtensions.cs @@ -12,22 +12,22 @@ namespace Microsoft.AspNetCore.SignalR.Redis.Internal { // Category: RedisHubLifetimeManager private static readonly Action _connectingToEndpoints = - LoggerMessage.Define(LogLevel.Information, new EventId(1, nameof(ConnectingToEndpoints)), "Connecting to Redis endpoints: {endpoints}."); + LoggerMessage.Define(LogLevel.Information, new EventId(1, nameof(ConnectingToEndpoints)), "Connecting to Redis endpoints: {Endpoints}."); private static readonly Action _connected = LoggerMessage.Define(LogLevel.Information, new EventId(2, nameof(Connected)), "Connected to Redis."); private static readonly Action _subscribing = - LoggerMessage.Define(LogLevel.Trace, new EventId(3, nameof(Subscribing)), "Subscribing to channel: {channel}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(3, nameof(Subscribing)), "Subscribing to channel: {Channel}."); private static readonly Action _receivedFromChannel = - LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ReceivedFromChannel)), "Received message from Redis channel {channel}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ReceivedFromChannel)), "Received message from Redis channel {Channel}."); private static readonly Action _publishToChannel = - LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(PublishToChannel)), "Publishing message to Redis channel {channel}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(PublishToChannel)), "Publishing message to Redis channel {Channel}."); private static readonly Action _unsubscribe = - LoggerMessage.Define(LogLevel.Trace, new EventId(6, nameof(Unsubscribe)), "Unsubscribing from channel: {channel}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(6, nameof(Unsubscribe)), "Unsubscribing from channel: {Channel}."); private static readonly Action _notConnected = LoggerMessage.Define(LogLevel.Warning, new EventId(7, nameof(Connected)), "Not connected to Redis."); diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs index 0722372b07..3d02162943 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(2, "HttpConnectionClosed"), "Connection was closed from a different thread."); private static readonly Action _startingTransport = - LoggerMessage.Define(LogLevel.Debug, new EventId(3, "StartingTransport"), "Starting transport '{transport}' with Url: {url}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(3, "StartingTransport"), "Starting transport '{Transport}' with Url: {Url}."); private static readonly Action _processRemainingMessages = LoggerMessage.Define(LogLevel.Debug, new EventId(4, "ProcessRemainingMessages"), "Ensuring all outstanding messages are processed."); @@ -30,13 +30,13 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(6, "CompleteClosed"), "Completing Closed task."); private static readonly Action _establishingConnection = - LoggerMessage.Define(LogLevel.Debug, new EventId(7, "EstablishingConnection"), "Establishing Connection at: {url}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(7, "EstablishingConnection"), "Establishing Connection at: {Url}."); private static readonly Action _errorWithNegotiation = - LoggerMessage.Define(LogLevel.Error, new EventId(8, "ErrorWithNegotiation"), "Failed to start connection. Error getting negotiation response from '{url}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(8, "ErrorWithNegotiation"), "Failed to start connection. Error getting negotiation response from '{Url}'."); private static readonly Action _errorStartingTransport = - LoggerMessage.Define(LogLevel.Error, new EventId(9, "ErrorStartingTransport"), "Failed to start connection. Error starting transport '{transport}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(9, "ErrorStartingTransport"), "Failed to start connection. Error starting transport '{Transport}'."); private static readonly Action _httpReceiveStarted = LoggerMessage.Define(LogLevel.Trace, new EventId(10, "HttpReceiveStarted"), "Beginning receive loop."); @@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Information, new EventId(18, "StoppingClient"), "Stopping client."); private static readonly Action _exceptionThrownFromCallback = - LoggerMessage.Define(LogLevel.Error, new EventId(19, "ExceptionThrownFromCallback"), "An exception was thrown from the '{callback}' callback."); + LoggerMessage.Define(LogLevel.Error, new EventId(19, "ExceptionThrownFromCallback"), "An exception was thrown from the '{Callback}' callback."); private static readonly Action _disposingClient = LoggerMessage.Define(LogLevel.Information, new EventId(20, "DisposingClient"), "Disposing client."); @@ -84,19 +84,19 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(24, "SkippingDispose"), "Skipping dispose, connection is already disposed."); private static readonly Action _connectionStateChanged = - LoggerMessage.Define(LogLevel.Debug, new EventId(25, "ConnectionStateChanged"), "Connection state changed from {previousState} to {newState}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(25, "ConnectionStateChanged"), "Connection state changed from {PreviousState} to {NewState}."); private static readonly Action _transportNotSupported = - LoggerMessage.Define(LogLevel.Debug, new EventId(26, "TransportNotSupported"), "Skipping transport {transportName} because it is not supported by this client."); + LoggerMessage.Define(LogLevel.Debug, new EventId(26, "TransportNotSupported"), "Skipping transport {TransportName} because it is not supported by this client."); private static readonly Action _transportDoesNotSupportTransferFormat = - LoggerMessage.Define(LogLevel.Debug, new EventId(27, "TransportDoesNotSupportTransferFormat"), "Skipping transport {transportName} because it does not support the requested transfer format '{transferFormat}'."); + LoggerMessage.Define(LogLevel.Debug, new EventId(27, "TransportDoesNotSupportTransferFormat"), "Skipping transport {TransportName} because it does not support the requested transfer format '{TransferFormat}'."); private static readonly Action _transportDisabledByClient = - LoggerMessage.Define(LogLevel.Debug, new EventId(28, "TransportDisabledByClient"), "Skipping transport {transportName} because it was disabled by the client."); + LoggerMessage.Define(LogLevel.Debug, new EventId(28, "TransportDisabledByClient"), "Skipping transport {TransportName} because it was disabled by the client."); private static readonly Action _transportFailed = - LoggerMessage.Define(LogLevel.Debug, new EventId(29, "TransportFailed"), "Skipping transport {transportName} because it failed to initialize."); + LoggerMessage.Define(LogLevel.Debug, new EventId(29, "TransportFailed"), "Skipping transport {TransportName} because it failed to initialize."); public static void HttpConnectionStarting(ILogger logger) { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs index 1e333fdb32..5148cf73fd 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Sockets.Client private static class Log { private static readonly Action _startTransport = - LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {transferFormat}."); + LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {TransferFormat}."); private static readonly Action _transportStopped = LoggerMessage.Define(LogLevel.Debug, new EventId(2, "TransportStopped"), "Transport stopped."); @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(8, "ReceivedMessages"), "Received messages from the server."); private static readonly Action _errorPolling = - LoggerMessage.Define(LogLevel.Error, new EventId(9, "ErrorPolling"), "Error while polling '{pollUrl}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(9, "ErrorPolling"), "Error while polling '{PollUrl}'."); // EventIds 100 - 106 used in SendUtils diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs index ec7487371d..d113feec6e 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs @@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(102, "SendCanceled"), "Send loop canceled."); private static readonly Action _sendingMessages = - LoggerMessage.Define(LogLevel.Debug, new EventId(103, "SendingMessages"), "Sending {count} bytes to the server using url: {url}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(103, "SendingMessages"), "Sending {Count} bytes to the server using url: {Url}."); private static readonly Action _sentSuccessfully = LoggerMessage.Define(LogLevel.Debug, new EventId(104, "SentSuccessfully"), "Message(s) sent successfully."); @@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(105, "NoMessages"), "No messages in batch to send."); private static readonly Action _errorSending = - LoggerMessage.Define(LogLevel.Error, new EventId(106, "ErrorSending"), "Error while sending to '{url}'."); + LoggerMessage.Define(LogLevel.Error, new EventId(106, "ErrorSending"), "Error while sending to '{Url}'."); // When adding a new log message make sure to check with LongPollingTransport and ServerSentEventsTransport that share these logs to not have conflicting EventIds // We start the IDs at 100 to make it easy to avoid conflicting IDs diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs index 416c92d8d7..df8e93360a 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Sockets.Client private static class Log { private static readonly Action _startTransport = - LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {transferFormat}."); + LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {TransferFormat}."); private static readonly Action _transportStopped = LoggerMessage.Define(LogLevel.Debug, new EventId(2, "TransportStopped"), "Transport stopped."); @@ -30,13 +30,13 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Information, new EventId(6, "TransportStopping"), "Transport is stopping."); private static readonly Action _messageToApp = - LoggerMessage.Define(LogLevel.Debug, new EventId(7, "MessageToApp"), "Passing message to application. Payload size: {count}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(7, "MessageToApp"), "Passing message to application. Payload size: {Count}."); private static readonly Action _eventStreamEnded = LoggerMessage.Define(LogLevel.Debug, new EventId(8, "EventStreamEnded"), "Server-Sent Event Stream ended."); private static readonly Action _parsingSSE = - LoggerMessage.Define(LogLevel.Debug, new EventId(9, "ParsingSSE"), "Received {count} bytes. Parsing SSE frame."); + LoggerMessage.Define(LogLevel.Debug, new EventId(9, "ParsingSSE"), "Received {Count} bytes. Parsing SSE frame."); // EventIds 100 - 106 used in SendUtils diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs index 7b4b8adc88..d182d0daa7 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Sockets.Client private static class Log { private static readonly Action _startTransport = - LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {transferFormat}."); + LoggerMessage.Define(LogLevel.Information, new EventId(1, "StartTransport"), "Starting transport. Transfer mode: {TransferFormat}."); private static readonly Action _transportStopped = LoggerMessage.Define(LogLevel.Debug, new EventId(2, "TransportStopped"), "Transport stopped."); @@ -40,16 +40,16 @@ namespace Microsoft.AspNetCore.Sockets.Client LoggerMessage.Define(LogLevel.Debug, new EventId(9, "SendCanceled"), "Send loop canceled."); private static readonly Action _messageToApp = - LoggerMessage.Define(LogLevel.Debug, new EventId(10, "MessageToApp"), "Passing message to application. Payload size: {count}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(10, "MessageToApp"), "Passing message to application. Payload size: {Count}."); private static readonly Action _webSocketClosed = - LoggerMessage.Define(LogLevel.Information, new EventId(11, "WebSocketClosed"), "Websocket closed by the server. Close status {closeStatus}."); + LoggerMessage.Define(LogLevel.Information, new EventId(11, "WebSocketClosed"), "Websocket closed by the server. Close status {CloseStatus}."); private static readonly Action _messageReceived = - LoggerMessage.Define(LogLevel.Debug, new EventId(12, "MessageReceived"), "Message received. Type: {messageType}, size: {count}, EndOfMessage: {endOfMessage}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(12, "MessageReceived"), "Message received. Type: {MessageType}, size: {Count}, EndOfMessage: {EndOfMessage}."); private static readonly Action _receivedFromApp = - LoggerMessage.Define(LogLevel.Debug, new EventId(13, "ReceivedFromApp"), "Received message from application. Payload size: {count}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(13, "ReceivedFromApp"), "Received message from application. Payload size: {Count}."); private static readonly Action _sendMessageCanceled = LoggerMessage.Define(LogLevel.Information, new EventId(14, "SendMessageCanceled"), "Sending a message canceled."); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs b/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs index ad91a17f25..1cdc33e490 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs @@ -11,13 +11,13 @@ namespace Microsoft.AspNetCore.Sockets private static class Log { private static readonly Action _connectionDisposed = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {connectionId} was disposed."); + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {SocketsConnectionId} was disposed."); private static readonly Action _connectionAlreadyActive = - LoggerMessage.Define(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {connectionId} is already active via {requestId}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {SocketsConnectionId} is already active via {RequestId}."); private static readonly Action _pollCanceled = - LoggerMessage.Define(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {connectionId} on {requestId}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {SocketsConnectionId} on {RequestId}."); private static readonly Action _establishedConnection = LoggerMessage.Define(LogLevel.Debug, new EventId(4, "EstablishedConnection"), "Establishing new connection."); @@ -26,13 +26,13 @@ namespace Microsoft.AspNetCore.Sockets LoggerMessage.Define(LogLevel.Debug, new EventId(5, "ResumingConnection"), "Resuming existing connection."); private static readonly Action _receivedBytes = - LoggerMessage.Define(LogLevel.Trace, new EventId(6, "ReceivedBytes"), "Received {count} bytes."); + LoggerMessage.Define(LogLevel.Trace, new EventId(6, "ReceivedBytes"), "Received {Count} bytes."); private static readonly Action _transportNotSupported = - LoggerMessage.Define(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{transportType} transport not supported by this endpoint type."); + LoggerMessage.Define(LogLevel.Debug, new EventId(7, "TransportNotSupported"), "{TransportType} transport not supported by this endpoint type."); private static readonly Action _cannotChangeTransport = - LoggerMessage.Define(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {transportType}, requesting {requestedTransport}."); + LoggerMessage.Define(LogLevel.Error, new EventId(8, "CannotChangeTransport"), "Cannot change transports mid-connection; currently using {TransportType}, requesting {RequestedTransport}."); private static readonly Action _postNotallowedForWebsockets = LoggerMessage.Define(LogLevel.Debug, new EventId(9, "PostNotAllowedForWebSockets"), "POST requests are not allowed for websocket connections."); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs b/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs index 6c1a8552b0..5082a1454f 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs @@ -10,25 +10,25 @@ namespace Microsoft.AspNetCore.Sockets.Internal { // Category: ConnectionManager private static readonly Action _createdNewConnection = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {connectionId} created."); + LoggerMessage.Define(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {SocketsConnectionId} created."); private static readonly Action _removedConnection = - LoggerMessage.Define(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {connectionId} from the list of connections."); + LoggerMessage.Define(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {SocketsConnectionId} from the list of connections."); private static readonly Action _failedDispose = - LoggerMessage.Define(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {connectionId}."); + LoggerMessage.Define(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {SocketsConnectionId}."); private static readonly Action _connectionReset = - LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {connectionId} was reset."); + LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {SocketsConnectionId} was reset."); private static readonly Action _connectionTimedOut = - LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {connectionId} timed out."); + LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {SocketsConnectionId} timed out."); private static readonly Action _scanningConnections = LoggerMessage.Define(LogLevel.Trace, new EventId(6, nameof(ScanningConnections)), "Scanning connections."); private static readonly Action _scannedConnections = - LoggerMessage.Define(LogLevel.Trace, new EventId(7, nameof(ScannedConnections)), "Scanned connections in {duration}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(7, nameof(ScannedConnections)), "Scanned connections in {Duration}."); public static void CreatedNewConnection(this ILogger logger, string connectionId) { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs index 846c742d10..be17496883 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs @@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal.Transports LoggerMessage.Define(LogLevel.Debug, new EventId(2, "PollTimedOut"), "Poll request timed out. Sending 200 response to connection."); private static readonly Action _longPollingWritingMessage = - LoggerMessage.Define(LogLevel.Trace, new EventId(3, "LongPollingWritingMessage"), "Writing a {count} byte message to connection."); + LoggerMessage.Define(LogLevel.Trace, new EventId(3, "LongPollingWritingMessage"), "Writing a {Count} byte message to connection."); private static readonly Action _longPollingDisconnected = LoggerMessage.Define(LogLevel.Debug, new EventId(4, "LongPollingDisconnected"), "Client disconnected from Long Polling endpoint for connection."); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs index 76ec9b42ce..5c35033b16 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs @@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal.Transports private static class Log { private static readonly Action _sseWritingMessage = - LoggerMessage.Define(LogLevel.Trace, new EventId(1, "SSEWritingMessage"), "Writing a {count} byte message."); + LoggerMessage.Define(LogLevel.Trace, new EventId(1, "SSEWritingMessage"), "Writing a {Count} byte message."); public static void SSEWritingMessage(ILogger logger, long count) { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs index 2995e92997..3de933a1a1 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal.Transports LoggerMessage.Define(LogLevel.Debug, new EventId(2, "SocketClosed"), "Socket closed."); private static readonly Action _clientClosed = - LoggerMessage.Define(LogLevel.Debug, new EventId(3, "ClientClosed"), "Client closed connection with status code '{status}' ({description}). Signaling end-of-input to application."); + LoggerMessage.Define(LogLevel.Debug, new EventId(3, "ClientClosed"), "Client closed connection with status code '{Status}' ({Description}). Signaling end-of-input to application."); private static readonly Action _waitingForSend = LoggerMessage.Define(LogLevel.Debug, new EventId(4, "WaitingForSend"), "Waiting for the application to finish sending data."); @@ -36,13 +36,13 @@ namespace Microsoft.AspNetCore.Sockets.Internal.Transports LoggerMessage.Define(LogLevel.Debug, new EventId(8, "CloseTimedOut"), "Timed out waiting for client to send the close frame, aborting the connection."); private static readonly Action _messageReceived = - LoggerMessage.Define(LogLevel.Trace, new EventId(9, "MessageReceived"), "Message received. Type: {messageType}, size: {size}, EndOfMessage: {endOfMessage}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(9, "MessageReceived"), "Message received. Type: {MessageType}, size: {Size}, EndOfMessage: {EndOfMessage}."); private static readonly Action _messageToApplication = - LoggerMessage.Define(LogLevel.Trace, new EventId(10, "MessageToApplication"), "Passing message to application. Payload size: {size}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(10, "MessageToApplication"), "Passing message to application. Payload size: {Size}."); private static readonly Action _sendPayload = - LoggerMessage.Define(LogLevel.Trace, new EventId(11, "SendPayload"), "Sending payload: {size} bytes."); + LoggerMessage.Define(LogLevel.Trace, new EventId(11, "SendPayload"), "Sending payload: {Size} bytes."); private static readonly Action _errorWritingFrame = LoggerMessage.Define(LogLevel.Error, new EventId(12, "ErrorWritingFrame"), "Error writing frame.");