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

Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor

Browse Source 
# Conflicts:
#	Build/MQTTnet.nuspec
This commit is contained in:
Christian
2021-11-01 17:36:04 +01:00
parent 22ccdf10c6 8020e66f41
commit 7993db2d82
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/MQTTnet.nuspec
+1
View File
@@ -34,6 +34,7 @@
* [Server] Added support for a custom exception handler in _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_. * [Server] Added support for a custom exception handler in _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_.
* [Server] Removed logger from _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_ (BREAKING CHANGE!). * [Server] Removed logger from _MqttServerMultiThreadedApplicationMessageInterceptorDelegate_ (BREAKING CHANGE!).
* [Server] Fixed a memory leak when deleting sessions. * [Server] Fixed a memory leak when deleting sessions.
* [Server] Fixed timestamp check in server keep-alive monitor (thanks to @logicaloud, #1277).
* [Server] Added support for returning individual subscription errors (#80 thanks to @jimch) * [Server] Added support for returning individual subscription errors (#80 thanks to @jimch)
* [Server] Improved topic filter comparisons (support for $). * [Server] Improved topic filter comparisons (support for $).
* [Server] Fixed wrong "IsSessionPresent" result (thanks to @logicaloud, #1268). * [Server] Fixed wrong "IsSessionPresent" result (thanks to @logicaloud, #1268).
Source/MQTTnet/Implementations/MqttTcpServerAdapter.Uwp.cs
+3 -3
View File
@@ -1,7 +1,7 @@
#if WINDOWS_UWP #if WINDOWS_UWP
using Windows.Networking.Sockets; using Windows.Networking.Sockets;
using MQTTnet.Adapter; using MQTTnet.Adapter;
using MQTTnet.Diagnostics; using MQTTnet.Diagnostics.Logger;
using MQTTnet.Formatter; using MQTTnet.Formatter;
using MQTTnet.Server; using MQTTnet.Server;
using System; using System;
@@ -13,7 +13,7 @@ namespace MQTTnet.Implementations
{ {
public sealed class MqttTcpServerAdapter : IMqttServerAdapter public sealed class MqttTcpServerAdapter : IMqttServerAdapter
{ {
readonly IMqttNetScopedLogger _logger; readonly MqttNetSourceLogger _logger;
readonly IMqttNetLogger _rootLogger; readonly IMqttNetLogger _rootLogger;
IMqttServerOptions _options; IMqttServerOptions _options;
@@ -22,7 +22,7 @@ namespace MQTTnet.Implementations
public MqttTcpServerAdapter(IMqttNetLogger logger) public MqttTcpServerAdapter(IMqttNetLogger logger)
{ {
_rootLogger = logger ?? throw new ArgumentNullException(nameof(logger)); _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
_logger = logger.CreateScopedLogger(nameof(MqttTcpServerAdapter)); _logger = logger.WithSource(nameof(MqttTcpServerAdapter));
} }
public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; } public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }