Update NuGets and small bug fixes.

Author: barnstee

MQTTClient.cs

@@ -2,7 +2,6 @@
 namespace Opc.Ua.Cloud.Commander
 {
     using MQTTnet;
-    using MQTTnet.Adapter;
     using MQTTnet.Exceptions;
     using MQTTnet.Packets;
     using MQTTnet.Protocol;
@@ -149,11 +148,14 @@ public void Connect()
                     // wait a 5 seconds, then simply reconnect again, if needed
                     Task.Delay(TimeSpan.FromSeconds(5)).GetAwaiter().GetResult();
 
-                    MqttClientConnectResult connectResult = _client.ConnectAsync(clientOptions.Build(), _cancellationTokenSource.Token).GetAwaiter().GetResult();
-                    if (connectResult.ResultCode != MqttClientConnectResultCode.Success)
+                    if (!_client.IsConnected)
                     {
-                        string status = GetStatus(connectResult.UserProperties)?.ToString("x4");
-                        throw new Exception($"Connection to MQTT broker failed. Status: {connectResult.ResultCode}; status: {status}");
+                        MqttClientConnectResult connectResult = _client.ConnectAsync(clientOptions.Build(), _cancellationTokenSource.Token).GetAwaiter().GetResult();
+                        if (connectResult.ResultCode != MqttClientConnectResultCode.Success)
+                        {
+                            string status = GetStatus(connectResult.UserProperties)?.ToString("x4");
+                            throw new Exception($"Connection to MQTT broker failed. Status: {connectResult.ResultCode}; status: {status}");
+                        }
                     }
 
                     return Task.CompletedTask;
@@ -221,7 +223,12 @@ private MqttApplicationMessage BuildResponse(string status, string id, byte[] pa
         // parses status from packet properties
         private int? GetStatus(List<MqttUserProperty> properties)
         {
-            var status = properties.FirstOrDefault(up => up.Name == "status");
+            if (properties == null)
+            {
+                return null;
+            }
+
+            MqttUserProperty status = properties.FirstOrDefault(up => up.Name == "status");
             if (status == null)
             {
                 return null;

Program.cs

@@ -48,7 +48,7 @@ public static async Task Main()
             {
                 throw new Exception("Application instance certificate invalid!");
             }
-            
+
             // create OPC UA cert validator
             app.ApplicationConfiguration.CertificateValidator = new CertificateValidator();
             app.ApplicationConfiguration.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(OPCUAServerCertificateValidationCallback);
@@ -62,7 +62,7 @@ public static async Task Main()
 
             // start the server.
             app.Start(new UAServer()).GetAwaiter().GetResult();
-            Serilog.Log.Logger.Information("Server started.");
+            Log.Logger.Information("Server started.");
 
             MQTTClient methodHandlerMQTT = null;
             KafkaClient methodHandlerKafka = null;
@@ -78,7 +78,7 @@ public static async Task Main()
                 methodHandlerMQTT.Connect();
             }
 
-            Serilog.Log.Logger.Information("UA Cloud Commander is running.");
+            Log.Logger.Information("UA Cloud Commander is running.");
 
             await Task.Delay(Timeout.Infinite).ConfigureAwait(false);
         }
@@ -125,8 +125,8 @@ private static void InitLogging(string pathToLogFile)
             loggerConfiguration.WriteTo.Console();
             loggerConfiguration.WriteTo.File(Path.Combine(pathToLogFile, "uacloudcommander.logfile.txt"), fileSizeLimitBytes: 1024 * 1024, rollOnFileSizeLimit: true, retainedFileCountLimit: 10);
 
-            Serilog.Log.Logger = loggerConfiguration.CreateLogger();
-            Serilog.Log.Logger.Information($"Log file is: {Path.Combine(pathToLogFile, "uacloudcommander.logfile.txt")}");
+            Log.Logger = loggerConfiguration.CreateLogger();
+            Log.Logger.Information($"Log file is: {Path.Combine(pathToLogFile, "uacloudcommander.logfile.txt")}");
         }
     }
 }

UACloudCommander.csproj

@@ -29,11 +29,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confluent.Kafka" Version="2.8.0" />
+    <PackageReference Include="Confluent.Kafka" Version="2.9.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
     <PackageReference Include="MQTTnet" Version="5.0.1.1416" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.375.443" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.375.443" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.375.457" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.375.457" />
     <PackageReference Include="Serilog" Version="4.2.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />