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

fixed blocking code in networkstrem and reduced sleep in tests

Browse Source
This commit is contained in:
JanEggers
2018-07-19 21:13:28 +02:00
parent b55f5ff298
commit 53bd2a0960
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Server/MqttClientSession.cs
+22 -10
View File
@@ -30,6 +30,7 @@ namespace MQTTnet.Server
private bool _wasCleanDisconnect;
private IMqttChannelAdapter _adapter;
private Task<bool> _run;
private IDisposable _cleanupHandle;
public MqttClientSession(
string clientId,
@@ -84,6 +85,10 @@ namespace MQTTnet.Server
adapter.ReadingPacketCompleted += OnAdapterReadingPacketCompleted;
_cancellationTokenSource = new CancellationTokenSource();
//woraround for https://github.com/dotnet/corefx/issues/24430
_cleanupHandle = _cancellationTokenSource.Token.Register(() => Cleanup());
//endworkaround
_wasCleanDisconnect = false;
_willMessage = connectPacket.WillMessage;
@@ -129,20 +134,14 @@ namespace MQTTnet.Server
{
_adapter.ReadingPacketStarted -= OnAdapterReadingPacketStarted;
_adapter.ReadingPacketCompleted -= OnAdapterReadingPacketCompleted;
try
{
await _adapter.DisconnectAsync(_options.DefaultCommunicationTimeout, CancellationToken.None).ConfigureAwait(false);
_adapter.Dispose();
}
catch (Exception exception)
{
_logger.Error(exception, exception.Message);
}
await Cleanup();
}
_adapter = null;
_cleanupHandle?.Dispose();
_cleanupHandle = null;
_cancellationTokenSource?.Dispose();
_cancellationTokenSource = null;
}
@@ -150,6 +149,19 @@ namespace MQTTnet.Server
return _wasCleanDisconnect;
}
private async Task Cleanup()
{
try
{
await _adapter.DisconnectAsync(_options.DefaultCommunicationTimeout, CancellationToken.None).ConfigureAwait(false);
_adapter.Dispose();
}
catch (Exception exception)
{
_logger.Error(exception, exception.Message);
}
}
public void Stop(MqttClientDisconnectType type)
{
try