YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-23 22:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some more cleaning up:

Browse Source
This commit is contained in:
Lucas Rosa
2019-10-29 12:55:57 -03:00
parent 5c25905510
commit 4105beb7e6
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Server/MqttClientConnection.cs
-1
View File
@@ -12,7 +12,6 @@ using MQTTnet.PacketDispatcher;
using MQTTnet.Packets; using MQTTnet.Packets;
using MQTTnet.Protocol; using MQTTnet.Protocol;
using MQTTnet.Server.Status; using MQTTnet.Server.Status;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server namespace MQTTnet.Server
{ {
Source/MQTTnet/Server/MqttClientSessionsManager.cs
+3 -6
View File
@@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Adapter; using MQTTnet.Adapter;
@@ -231,8 +230,7 @@ namespace MQTTnet.Server
{ {
var disconnectType = MqttClientDisconnectType.NotClean; var disconnectType = MqttClientDisconnectType.NotClean;
string clientId = null; string clientId = null;
var clientWasConnected = true;
var ok = true;
try try
{ {
@@ -249,7 +247,7 @@ namespace MQTTnet.Server
if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success) if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success)
{ {
ok = false; clientWasConnected = false;
// Send failure response here without preparing a session. The result for a successful connect // Send failure response here without preparing a session. The result for a successful connect
// will be sent from the session itself. // will be sent from the session itself.
var connAckPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext); var connAckPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext);
@@ -263,7 +261,6 @@ namespace MQTTnet.Server
await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false); await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false);
disconnectType = await connection.RunAsync().ConfigureAwait(false); disconnectType = await connection.RunAsync().ConfigureAwait(false);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
@@ -274,7 +271,7 @@ namespace MQTTnet.Server
} }
finally finally
{ {
if (ok) if (clientWasConnected)
{ {
if (clientId != null) if (clientId != null)
{ {
Source/MQTTnet/Server/MqttClientSubscriptionsManager.cs
+1 -1
View File
@@ -4,7 +4,6 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Packets; using MQTTnet.Packets;
using MQTTnet.Protocol; using MQTTnet.Protocol;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server namespace MQTTnet.Server
{ {
@@ -158,6 +157,7 @@ namespace MQTTnet.Server
{ {
continue; continue;
} }
qosLevels.Add(subscription.Value.QualityOfServiceLevel); qosLevels.Add(subscription.Value.QualityOfServiceLevel);
} }
} }
Source/MQTTnet/Server/MqttServerEventDispatcher.cs
-1
View File
@@ -2,7 +2,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Client.Receiving; using MQTTnet.Client.Receiving;
using MQTTnet.Diagnostics; using MQTTnet.Diagnostics;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server namespace MQTTnet.Server
{ {