Merge

Frameworks/MQTTnet.NetStandard/Server/MqttClientDisconnectType.cs

@@ -0,0 +1,8 @@
+namespace MQTTnet.Server
+{
+    public enum MqttClientDisconnectType
+    {
+        Clean,
+        NotClean
+    }
+}

Frameworks/MQTTnet.NetStandard/Server/MqttClientPendingMessagesQueue.cs

@@ -127,7 +127,7 @@ namespace MQTTnet.Server
 
                 if (!cancellationToken.IsCancellationRequested)
                 {
-                    await _clientSession.StopAsync().ConfigureAwait(false);
+                    await _clientSession.StopAsync(MqttClientDisconnectType.NotClean).ConfigureAwait(false);
                 }
             }
         }

Frameworks/MQTTnet.NetStandard/Server/MqttClientSession.cs

@@ -101,7 +101,7 @@ namespace MQTTnet.Server
             return _wasCleanDisconnect;
         }
 
-        public Task StopAsync(bool wasCleanDisconnect = false)
+        public async Task StopAsync(MqttClientDisconnectType type)
         {
             try
             {
@@ -110,7 +110,7 @@ namespace MQTTnet.Server
                     return Task.FromResult(0);
                 }
 
-                _wasCleanDisconnect = wasCleanDisconnect;
+                _wasCleanDisconnect = type == MqttClientDisconnectType.Clean;
 
                 _cancellationTokenSource?.Cancel(false);
                 PendingMessagesQueue.WaitForCompletion();
@@ -119,7 +119,7 @@ namespace MQTTnet.Server
                 var willMessage = _willMessage;
                 _willMessage = null; // clear willmessage so it is send just once
 
-                if (_willMessage != null && !wasCleanDisconnect)
+                if (willMessage != null && !_wasCleanDisconnect)
                 {
                     _sessionsManager.StartDispatchApplicationMessage(this, willMessage);
                 }
@@ -186,7 +186,7 @@ namespace MQTTnet.Server
         private Task StopDueToKeepAliveTimeoutAsync()
         {
             _logger.Info<MqttClientSession>("Client '{0}': Timeout while waiting for KeepAlive packet.", ClientId);
-            return StopAsync();
+            return StopAsync(MqttClientDisconnectType.NotClean);
         }
 
         private async Task ReceivePacketsAsync(IMqttChannelAdapter adapter, CancellationToken cancellationToken)
@@ -203,15 +203,18 @@ namespace MQTTnet.Server
             catch (OperationCanceledException)
             {
             }
-            catch (MqttCommunicationException exception)
-            {
-                _logger.Warning<MqttClientSession>(exception, "Client '{0}': Communication exception while processing client packets.", ClientId);
-                await StopAsync().ConfigureAwait(false);
-            }
             catch (Exception exception)
             {
-                _logger.Error<MqttClientSession>(exception, "Client '{0}': Unhandled exception while processing client packets.", ClientId);
-                await StopAsync().ConfigureAwait(false);
+                if (exception is MqttCommunicationException)
+                {
+                    _logger.Warning<MqttClientSession>(exception, "Client '{0}': Communication exception while processing client packets.", ClientId);
+                }
+                else
+                {
+                    _logger.Error<MqttClientSession>(exception, "Client '{0}': Unhandled exception while processing client packets.", ClientId);
+                }
+
+                await StopAsync(MqttClientDisconnectType.NotClean).ConfigureAwait(false);
             }
         }
 
@@ -260,16 +263,16 @@ namespace MQTTnet.Server
 
             if (packet is MqttDisconnectPacket)
             {
-                return StopAsync(true);
+                return StopAsync(MqttClientDisconnectType.Clean);
             }
 
             if (packet is MqttConnectPacket)
             {
-                return StopAsync();
+                return StopAsync(MqttClientDisconnectType.NotClean);
             }
 
             _logger.Warning<MqttClientSession>("Client '{0}': Received not supported packet ({1}). Closing connection.", ClientId, packet);
-            return StopAsync();
+            return StopAsync(MqttClientDisconnectType.NotClean);
         }
 
         private async Task EnqueueSubscribedRetainedMessagesAsync(ICollection<TopicFilter> topicFilters)
@@ -288,7 +291,7 @@ namespace MQTTnet.Server
 
             if (subscribeResult.CloseConnection)
             {
-                await StopAsync().ConfigureAwait(false);
+                await StopAsync(MqttClientDisconnectType.NotClean).ConfigureAwait(false);
             }
 
             await EnqueueSubscribedRetainedMessagesAsync(subscribePacket.TopicFilters).ConfigureAwait(false);

Frameworks/MQTTnet.NetStandard/Server/MqttClientSessionsManager.cs

@@ -120,7 +120,7 @@ namespace MQTTnet.Server
             {
                 foreach (var session in _sessions)
                 {
-                    await session.Value.StopAsync().ConfigureAwait(false);
+                    await session.Value.StopAsync(MqttClientDisconnectType.NotClean).ConfigureAwait(false);
                 }
 
                 _sessions.Clear();
@@ -232,7 +232,7 @@ namespace MQTTnet.Server
                     {
                         _sessions.Remove(connectPacket.ClientId);
 
-                        await clientSession.StopAsync().ConfigureAwait(false);
+                        await clientSession.StopAsync(MqttClientDisconnectType.Clean).ConfigureAwait(false);
                         clientSession.Dispose();
                         clientSession = null;