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

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;
         }