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

Refactor code.

Browse Source
This commit is contained in:
Christian Kratky
2020-04-04 13:07:10 +02:00
parent aafc99f39e
commit b93cd5b673
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Server/IMqttServer.cs
+4 -5
View File
@@ -1,11 +1,12 @@
using System.Collections.Generic; using MQTTnet.Server.Status;
using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using MQTTnet.Server.Status;
namespace MQTTnet.Server namespace MQTTnet.Server
{ {
public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher
{ {
bool IsStarted { get; }
IMqttServerStartedHandler StartedHandler { get; set; } IMqttServerStartedHandler StartedHandler { get; set; }
IMqttServerStoppedHandler StoppedHandler { get; set; } IMqttServerStoppedHandler StoppedHandler { get; set; }
@@ -13,7 +14,7 @@ namespace MQTTnet.Server
IMqttServerClientDisconnectedHandler ClientDisconnectedHandler { get; set; } IMqttServerClientDisconnectedHandler ClientDisconnectedHandler { get; set; }
IMqttServerClientSubscribedTopicHandler ClientSubscribedTopicHandler { get; set; } IMqttServerClientSubscribedTopicHandler ClientSubscribedTopicHandler { get; set; }
IMqttServerClientUnsubscribedTopicHandler ClientUnsubscribedTopicHandler { get; set; } IMqttServerClientUnsubscribedTopicHandler ClientUnsubscribedTopicHandler { get; set; }
IMqttServerOptions Options { get; } IMqttServerOptions Options { get; }
Task<IList<IMqttClientStatus>> GetClientStatusAsync(); Task<IList<IMqttClientStatus>> GetClientStatusAsync();
@@ -27,7 +28,5 @@ namespace MQTTnet.Server
Task StartAsync(IMqttServerOptions options); Task StartAsync(IMqttServerOptions options);
Task StopAsync(); Task StopAsync();
bool IsStarted { get; }
} }
} }
Source/MQTTnet/Server/MqttServer.cs
+9 -9
View File
@@ -15,13 +15,13 @@ namespace MQTTnet.Server
{ {
public class MqttServer : IMqttServer public class MqttServer : IMqttServer
{ {
private readonly MqttServerEventDispatcher _eventDispatcher; readonly MqttServerEventDispatcher _eventDispatcher;
private readonly ICollection<IMqttServerAdapter> _adapters; readonly ICollection<IMqttServerAdapter> _adapters;
private readonly IMqttNetLogger _logger; readonly IMqttNetLogger _logger;
private MqttClientSessionsManager _clientSessionsManager; MqttClientSessionsManager _clientSessionsManager;
private IMqttRetainedMessagesManager _retainedMessagesManager; IMqttRetainedMessagesManager _retainedMessagesManager;
private CancellationTokenSource _cancellationTokenSource; CancellationTokenSource _cancellationTokenSource;
public MqttServer(IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) public MqttServer(IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger)
{ {
@@ -34,6 +34,8 @@ namespace MQTTnet.Server
_eventDispatcher = new MqttServerEventDispatcher(logger.CreateChildLogger(nameof(MqttServerEventDispatcher))); _eventDispatcher = new MqttServerEventDispatcher(logger.CreateChildLogger(nameof(MqttServerEventDispatcher)));
} }
public bool IsStarted => _cancellationTokenSource != null;
public IMqttServerStartedHandler StartedHandler { get; set; } public IMqttServerStartedHandler StartedHandler { get; set; }
public IMqttServerStoppedHandler StoppedHandler { get; set; } public IMqttServerStoppedHandler StoppedHandler { get; set; }
@@ -190,9 +192,7 @@ namespace MQTTnet.Server
return _retainedMessagesManager?.ClearMessagesAsync(); return _retainedMessagesManager?.ClearMessagesAsync();
} }
public bool IsStarted => _cancellationTokenSource != null; Task OnHandleClient(IMqttChannelAdapter channelAdapter)
private Task OnHandleClient(IMqttChannelAdapter channelAdapter)
{ {
return _clientSessionsManager.HandleClientConnectionAsync(channelAdapter); return _clientSessionsManager.HandleClientConnectionAsync(channelAdapter);
} }