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

Refactor code.

Browse Source
This commit is contained in:
Christian Kratky
2018-11-05 22:39:56 +01:00
parent be22e2551d
commit bddcbf6999
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs
+5 -5
View File
@@ -113,7 +113,7 @@ namespace MQTTnet.Extensions.ManagedClient
{ {
if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage)); if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
ManagedMqttApplicationMessage skippedMessage = null; ManagedMqttApplicationMessage removedMessage = null;
lock (_messageQueue) lock (_messageQueue)
{ {
if (_messageQueue.Count >= _options.MaxPendingMessages) if (_messageQueue.Count >= _options.MaxPendingMessages)
@@ -127,9 +127,9 @@ namespace MQTTnet.Extensions.ManagedClient
if (_options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropOldestQueuedMessage) if (_options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropOldestQueuedMessage)
{ {
skippedMessage = _messageQueue.RemoveFirst(); removedMessage = _messageQueue.RemoveFirst();
_logger.Verbose("Removed oldest application message from internal queue because it is full."); _logger.Verbose("Removed oldest application message from internal queue because it is full.");
ApplicationMessageSkipped?.Invoke(this, new ApplicationMessageSkippedEventArgs(skippedMessage)); ApplicationMessageSkipped?.Invoke(this, new ApplicationMessageSkippedEventArgs(removedMessage));
} }
} }
@@ -138,9 +138,9 @@ namespace MQTTnet.Extensions.ManagedClient
if (_storageManager != null) if (_storageManager != null)
{ {
if (skippedMessage != null) if (removedMessage != null)
{ {
await _storageManager.RemoveAsync(skippedMessage).ConfigureAwait(false); await _storageManager.RemoveAsync(removedMessage).ConfigureAwait(false);
} }
await _storageManager.AddAsync(applicationMessage).ConfigureAwait(false); await _storageManager.AddAsync(applicationMessage).ConfigureAwait(false);
Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientStorageManager.cs
+4
View File
@@ -28,6 +28,8 @@ namespace MQTTnet.Extensions.ManagedClient
public async Task AddAsync(ManagedMqttApplicationMessage applicationMessage) public async Task AddAsync(ManagedMqttApplicationMessage applicationMessage)
{ {
if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false)) using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false))
{ {
_messages.Add(applicationMessage); _messages.Add(applicationMessage);
@@ -37,6 +39,8 @@ namespace MQTTnet.Extensions.ManagedClient
public async Task RemoveAsync(ManagedMqttApplicationMessage applicationMessage) public async Task RemoveAsync(ManagedMqttApplicationMessage applicationMessage)
{ {
if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false)) using (await _messagesLock.LockAsync(CancellationToken.None).ConfigureAwait(false))
{ {
var index = _messages.IndexOf(applicationMessage); var index = _messages.IndexOf(applicationMessage);
Source/MQTTnet/Internal/BlockingQueue.cs
+1
View File
@@ -62,6 +62,7 @@ namespace MQTTnet.Internal
{ {
var item = _items.First; var item = _items.First;
_items.RemoveFirst(); _items.RemoveFirst();
return item.Value; return item.Value;
} }
} }