YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-28 01:02:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve connection handling.

Browse Source
This commit is contained in:
Christian Kratky
2019-04-20 21:12:30 +02:00
parent f60bbf7dd7
commit 5c903e6fbf
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Implementations/MqttTcpServerListener.cs
+10 -8
View File
@@ -82,7 +82,9 @@ namespace MQTTnet.Implementations
#else #else
var clientSocket = await _socket.AcceptAsync().ConfigureAwait(false); var clientSocket = await _socket.AcceptAsync().ConfigureAwait(false);
#endif #endif
await HandleClientConnection(clientSocket).ConfigureAwait(false); #pragma warning disable 4014
Task.Run(() => TryHandleClientConnectionAsync(clientSocket), cancellationToken);
#pragma warning restore 4014
} }
catch (Exception exception) catch (Exception exception)
{ {
@@ -92,12 +94,17 @@ namespace MQTTnet.Implementations
} }
} }
private async Task HandleClientConnection(Socket clientSocket) private async Task TryHandleClientConnectionAsync(Socket clientSocket)
{ {
Stream stream = null; Stream stream = null;
try try
{ {
_logger.Verbose("Client '{0}' accepted by TCP listener '{1}, {2}'.",
clientSocket.RemoteEndPoint,
_socket.LocalEndPoint,
_addressFamily == AddressFamily.InterNetwork ? "ipv4" : "ipv6");
clientSocket.NoDelay = _options.NoDelay; clientSocket.NoDelay = _options.NoDelay;
stream = new NetworkStream(clientSocket, true); stream = new NetworkStream(clientSocket, true);
@@ -109,11 +116,6 @@ namespace MQTTnet.Implementations
stream = sslStream; stream = sslStream;
} }
_logger.Verbose("Client '{0}' accepted by TCP listener '{1}, {2}'.",
clientSocket.RemoteEndPoint,
_socket.LocalEndPoint,
_addressFamily == AddressFamily.InterNetwork ? "ipv4" : "ipv6");
var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(stream), new MqttPacketFormatterAdapter(), _logger); var clientAdapter = new MqttChannelAdapter(new MqttTcpChannel(stream), new MqttPacketFormatterAdapter(), _logger);
ClientAcceptedHandler?.Invoke(new MqttServerAdapterClientAcceptedEventArgs(clientAdapter)); ClientAcceptedHandler?.Invoke(new MqttServerAdapterClientAcceptedEventArgs(clientAdapter));
} }
@@ -138,7 +140,7 @@ namespace MQTTnet.Implementations
} }
catch (Exception disposeException) catch (Exception disposeException)
{ {
throw new AggregateException(exception, disposeException); _logger.Error(disposeException, "Error while cleanup of broken connection.");
} }
} }
} }
Source/MQTTnet/Server/MqttClientSessionsManager.cs
+2 -10
View File
@@ -274,17 +274,9 @@ namespace MQTTnet.Server
{ {
_connections.TryRemove(clientId, out _); _connections.TryRemove(clientId, out _);
////connection?.ReferenceCounter.Decrement(); if (!_options.EnablePersistentSessions)
////if (connection?.ReferenceCounter.HasReferences == true)
////{
//// disconnectType = MqttClientDisconnectType.Takeover;
////}
////else
{ {
if (!_options.EnablePersistentSessions) await DeleteSessionAsync(clientId).ConfigureAwait(false);
{
await DeleteSessionAsync(clientId).ConfigureAwait(false);
}
} }
await TryCleanupChannelAsync(channelAdapter).ConfigureAwait(false); await TryCleanupChannelAsync(channelAdapter).ConfigureAwait(false);