Refactor logging. Remove TCP adapter from HTTP host if disabled.

Build/MQTTnet.nuspec

@@ -11,6 +11,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
     <releaseNotes> * [Core] Performance optimizations.
+* [Core] Due to performance reasons the timestamp of log messages is now in UTC format.
 * [Client] Received messages are now processed in the worker thread by default. Added a new setting for switching back to dedicated threads.
 * [Server] Added support for other WebSocket sub protocol formats like mqttv-3.1.1 (thanks to @israellot).
 * [Server] The takeover of an existing client sessions is now treated as a _clean_ disconnect of the previous client.

Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -25,6 +25,11 @@ namespace MQTTnet.AspNetCore
                             .FirstOrDefault(p => p.ToLower().StartsWith("mqtt"));
                     }
 
+                    if (subprotocol == null)
+                    {
+                        return;
+                    }
+
                     var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
                     using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subprotocol))
                     {

Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -31,12 +31,12 @@ namespace MQTTnet.AspNetCore
 
             var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(clientAdapter);
             ClientAccepted?.Invoke(this, eventArgs);
-            return eventArgs.SessionTask;
+            return eventArgs.SessionTask ?? Task.CompletedTask;
         }
         
         public void Dispose()
         {
-            StopAsync();
+            StopAsync().GetAwaiter().GetResult();
         }
     }
 }

Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs

@@ -14,16 +14,24 @@ namespace MQTTnet.AspNetCore
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
 
+            var logger = new MqttNetLogger();
+            var childLogger = logger.CreateChildLogger();
+
             services.AddSingleton(options);
-            services.AddSingleton<IMqttNetLogger>(new MqttNetLogger());
+            services.AddSingleton<IMqttNetLogger>(logger);
+            services.AddSingleton(childLogger);
             services.AddSingleton<MqttHostedServer>();
             services.AddSingleton<IHostedService>(s => s.GetService<MqttHostedServer>());
             services.AddSingleton<IMqttServer>(s => s.GetService<MqttHostedServer>());
-            
+
             services.AddSingleton<MqttWebSocketServerAdapter>();
             services.AddSingleton<MqttTcpServerAdapter>();
-            services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttWebSocketServerAdapter>()); 
-            services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttTcpServerAdapter>());
+            services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttWebSocketServerAdapter>());
+
+            if (options.DefaultEndpointOptions.IsEnabled)
+            {
+                services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttTcpServerAdapter>());
+            }
 
             return services;
         }

Frameworks/MQTTnet.NetStandard/Client/MqttClient.cs

@@ -504,20 +504,16 @@ namespace MQTTnet.Client
 
         private void StartReceivingPackets(CancellationToken cancellationToken)
         {
-            _packetReceiverTask = Task.Factory.StartNew(
+            _packetReceiverTask = Task.Run(
                 () => ReceivePacketsAsync(cancellationToken),
-                cancellationToken,
-                TaskCreationOptions.LongRunning,
-                TaskScheduler.Current);
+                cancellationToken);
         }
 
         private void StartSendingKeepAliveMessages(CancellationToken cancellationToken)
         {
-            _keepAliveMessageSenderTask = Task.Factory.StartNew(
+            _keepAliveMessageSenderTask = Task.Run(
                 () => SendKeepAliveMessagesAsync(cancellationToken),
-                cancellationToken,
-                TaskCreationOptions.LongRunning,
-                TaskScheduler.Current);
+                cancellationToken);
         }
 
         private void StartProcessReceivedPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken)

Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetChildLogger.cs

@@ -4,7 +4,7 @@ namespace MQTTnet.Diagnostics
 {
     public interface IMqttNetChildLogger
     {
-        IMqttNetChildLogger CreateChildLogger(string source);
+        IMqttNetChildLogger CreateChildLogger(string source = null);
 
         void Verbose(string message, params object[] parameters);
 

Frameworks/MQTTnet.NetStandard/Diagnostics/IMqttNetLogger.cs

@@ -6,7 +6,7 @@ namespace MQTTnet.Diagnostics
     {
         event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
 
-        IMqttNetChildLogger CreateChildLogger(string source);
+        IMqttNetChildLogger CreateChildLogger(string source = null);
 
         void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception);
     }

Frameworks/MQTTnet.NetStandard/Diagnostics/MqttNetLogger.cs

@@ -13,7 +13,7 @@ namespace MQTTnet.Diagnostics
 
         public event EventHandler<MqttNetLogMessagePublishedEventArgs> LogMessagePublished;
 
-        public IMqttNetChildLogger CreateChildLogger(string source)
+        public IMqttNetChildLogger CreateChildLogger(string source = null)
         {
             return new MqttNetChildLogger(this, source);
         }

Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpServerAdapter.cs

@@ -45,11 +45,8 @@ namespace MQTTnet.Implementations
                 _defaultEndpointSocket.Bind(new IPEndPoint(options.DefaultEndpointOptions.BoundIPAddress, options.GetDefaultEndpointPort()));
                 _defaultEndpointSocket.Listen(options.ConnectionBacklog);
 
-                Task.Factory.StartNew(
-                    () => AcceptDefaultEndpointConnectionsAsync(_cancellationTokenSource.Token),
-                    _cancellationTokenSource.Token, 
-                    TaskCreationOptions.LongRunning,
-                    TaskScheduler.Current);
+                Task.Run(() => AcceptDefaultEndpointConnectionsAsync(_cancellationTokenSource.Token),
+                    _cancellationTokenSource.Token);
             }
 
             if (options.TlsEndpointOptions.IsEnabled)
@@ -69,11 +66,9 @@ namespace MQTTnet.Implementations
                 _tlsEndpointSocket.Bind(new IPEndPoint(options.TlsEndpointOptions.BoundIPAddress, options.GetTlsEndpointPort()));
                 _tlsEndpointSocket.Listen(options.ConnectionBacklog);
 
-                Task.Factory.StartNew(
-                    () => AcceptTlsEndpointConnectionsAsync(_cancellationTokenSource.Token), 
-                    _cancellationTokenSource.Token,
-                    TaskCreationOptions.LongRunning,
-                    TaskScheduler.Current);
+                Task.Run(
+                    () => AcceptTlsEndpointConnectionsAsync(_cancellationTokenSource.Token),
+                    _cancellationTokenSource.Token);
             }
 
             return Task.FromResult(0);

Frameworks/MQTTnet.NetStandard/MqttFactory.cs

@@ -25,14 +25,14 @@ namespace MQTTnet
 
         public IManagedMqttClient CreateManagedMqttClient()
         {
-            return new ManagedMqttClient(CreateMqttClient(), new MqttNetLogger().CreateChildLogger(string.Empty));
+            return new ManagedMqttClient(CreateMqttClient(), new MqttNetLogger().CreateChildLogger());
         }
 
         public IManagedMqttClient CreateManagedMqttClient(IMqttNetLogger logger)
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new ManagedMqttClient(CreateMqttClient(), logger.CreateChildLogger(string.Empty));
+            return new ManagedMqttClient(CreateMqttClient(), logger.CreateChildLogger());
         }
 
         public IMqttServer CreateMqttServer()
@@ -45,7 +45,7 @@ namespace MQTTnet
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger.CreateChildLogger(string.Empty)) }, logger);
+            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger.CreateChildLogger()) }, logger);
         }
 
         public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger)
@@ -53,7 +53,7 @@ namespace MQTTnet
             if (adapters == null) throw new ArgumentNullException(nameof(adapters));
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return new MqttServer(adapters, logger.CreateChildLogger(string.Empty));
+            return new MqttServer(adapters, logger.CreateChildLogger());
         }
     }
 }

Frameworks/MQTTnet.NetStandard/Server/MqttServer.cs

@@ -157,11 +157,9 @@ namespace MQTTnet.Server
 
         private void OnClientAccepted(object sender, MqttServerAdapterClientAcceptedEventArgs eventArgs)
         {
-            eventArgs.SessionTask = Task.Factory.StartNew(
+            eventArgs.SessionTask = Task.Run(
                 () => _clientSessionsManager.RunSessionAsync(eventArgs.Client, _cancellationTokenSource.Token),
-                _cancellationTokenSource.Token,
-                TaskCreationOptions.LongRunning, 
-                TaskScheduler.Current);
+                _cancellationTokenSource.Token);
         }
     }
 }

Tests/MQTTnet.TestApp.AspNetCore2/MQTTnet.TestApp.AspNetCore2.csproj

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
   </ItemGroup>
 
   <ItemGroup>

Tests/MQTTnet.TestApp.NetCore/PerformanceTest.cs

@@ -17,8 +17,8 @@ namespace MQTTnet.TestApp.NetCore
             Console.WriteLine("Press 'c' for concurrent sends. Otherwise in one batch.");
             var concurrent = Console.ReadKey(true).KeyChar == 'c';
 
-            var server = Task.Factory.StartNew(async () => await RunServerAsync(), TaskCreationOptions.LongRunning);
-            var client = Task.Factory.StartNew(async () => await RunClientAsync(2000, TimeSpan.FromMilliseconds(10), concurrent), TaskCreationOptions.LongRunning);
+            var server = Task.Run(RunServerAsync);
+            var client = Task.Run(() => RunClientAsync(2000, TimeSpan.FromMilliseconds(10), concurrent));
 
             await Task.WhenAll(server, client).ConfigureAwait(false);
         }