Skip to content

Commit 1dc6b22

Browse files
committed
Lower EndpointOffline to warning
1 parent a7f0d8c commit 1dc6b22

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/Microsoft.Azure.SignalR.Common/ServiceConnections/Internal/WebSocketsTransport.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public WebSocketsTransport(WebSocketConnectionOptions connectionOptions,
4949
{
5050
_logger = (loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory))).CreateLogger<WebSocketsTransport>();
5151
_webSocket = new ClientWebSocket();
52-
5352
// Issue in ClientWebSocket prevents user-agent being set - https://github.com/dotnet/corefx/issues/26627
5453
//_webSocket.Options.SetRequestHeader("User-Agent", Constants.UserAgentHeader.ToString());
5554

@@ -88,6 +87,8 @@ public WebSocketsTransport(WebSocketConnectionOptions connectionOptions,
8887
_webSocket.Options.UseDefaultCredentials = connectionOptions.UseDefaultCredentials.Value;
8988
}
9089

90+
91+
9192
connectionOptions.WebSocketConfiguration?.Invoke(_webSocket.Options);
9293

9394
_closeTimeout = connectionOptions.CloseTimeout;

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionContainerBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ private static class Log
758758
LoggerMessage.Define<string, string>(LogLevel.Information, new EventId(1, "EndpointOnline"), "Hub '{hub}' is now connected to '{endpoint}'.");
759759

760760
private static readonly Action<ILogger, string, string, Exception> _endpointOffline =
761-
LoggerMessage.Define<string, string>(LogLevel.Error, new EventId(2, "EndpointOffline"), "Hub '{hub}' is now disconnected from '{endpoint}'. Please check log for detailed info.");
761+
LoggerMessage.Define<string, string>(LogLevel.Warning, new EventId(2, "EndpointOffline"), "Hub '{hub}' is now disconnected from '{endpoint}'. Please check log for detailed info.");
762762

763763
private static readonly Action<ILogger, Exception> _receivedFinAckPing =
764764
LoggerMessage.Define(LogLevel.Information, new EventId(3, "ReceivedFinAckPing"), "Received FinAck ping.");

test/Microsoft.Azure.SignalR.Tests/RunSignalRTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task TestRunSignalRWithSimpleHub()
6969
Assert.NotNull(connectionDisconnectLog);
7070
Assert.Equal("conn1 disconnected: .", connectionDisconnectLog.Write.Message);
7171

72-
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning));
72+
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning && s.Write.EventId.Name != "EndpointOffline").Select(s => s.Write.EventId.Name));
7373
}
7474

7575
[Fact]
@@ -108,7 +108,8 @@ public async Task TestRunSignalRWithSimpleHubAndMultipleConnections()
108108
Assert.Equal(0, logs.Count(s => s.Write.EventId.Name == "DetectedLongRunningApplicationTask"));
109109

110110
Assert.Equal(count, logs.Count(s => s.Write.LoggerName == typeof(SimpleHub).FullName));
111-
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning));
111+
112+
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning && s.Write.EventId.Name != "EndpointOffline").Select(s => s.Write.EventId.Name));
112113
}
113114

114115
[Fact]
@@ -146,7 +147,7 @@ public async Task TestRunSignalRWithConnectedSendingMessages()
146147
var connectionDisconnectLog = logs.FirstOrDefault(s => s.Write.LoggerName == typeof(ConnectedHub).FullName);
147148
Assert.NotNull(connectionDisconnectLog);
148149
Assert.Equal("conn1 disconnected: .", connectionDisconnectLog.Write.Message);
149-
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning && s.Write.EventId.Name != "DetectedLongRunningApplicationTask").Select(s => s.Write.EventId.Name));
150+
Assert.Empty(logs.Where(s => s.Write.LogLevel == LogLevel.Warning && s.Write.EventId.Name != "DetectedLongRunningApplicationTask" && s.Write.EventId.Name != "EndpointOffline").Select(s => s.Write.EventId.Name));
150151
}
151152

152153
private sealed class TestStartup<THub> : IStartup

0 commit comments

Comments
 (0)