Revize b10bb263

re #9568 Broke config loader down into separate methods.

ld_client/LDClient/Program.cs

@@ -61 +61 @@
         while (true) {
             Thread.Sleep(MainLoopDelayMs);
         }
-        
-        return 0;
     }
 }

ld_client/LDClient/network/data/ConnectionStatus.cs

@@ -1 +1 @@
 using System.Runtime.Serialization;
 
 namespace LDClient.network.data {
+    
     public enum ConnectionStatus {
+        
         [EnumMember(Value = "connected")]
         Connected,
         [EnumMember(Value = "disconnected")]
         Disconnected
-
     }
 }

ld_client/LDClient/network/data/DebuggerInfo.cs

@@ -4 +4 @@
     public class DebuggerInfo {
         
         [JsonPropertyName("serial_number")]
-        public string SerialNumber { get; set; }
+        public string? SerialNumber { get; set; }
     }
 }

ld_client/LDClient/network/data/Payload.cs

@@ -4 +4 @@
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace LDClient.network.data {
+    
     [JsonObject(MemberSerialization.OptIn)]
     public class Payload {
 
@@ -14 +15 @@
         public string? HostName { get; set; }
 
         [JsonPropertyName("timestamp")]
-        //[Newtonsoft.Json.JsonConverter(typeof(DateFormatConverter), "yyyy-MM-dd HH:mm:ss.ffffff")]
         public string? TimeStamp { get; set; }
 
         [JsonPropertyName("head_device")]
@@ -25 +25 @@
         public DebuggerInfo?  BodyDevice { get; set; }
         
         [JsonPropertyName("status")]
-        //[Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
         public ConnectionStatus Status { get; set; }
 
 

ld_client/LDClient/utils/ConfigLoader.cs

@@ -1 @@
-using System.Runtime.InteropServices;
-using LDClient.utils.loggers;
+using LDClient.utils.loggers;
 using Microsoft.Extensions.Configuration;
 
 namespace LDClient.utils {
     
     internal class ConfigLoader {
+
+        private const int ErrorExitCode = 1;
+        private const string ConfigFile = "appsettings.json";
         
         private const string LoggingSection = "Logging";
         private const string NetworkSection = "Network";
@@ -24 +26 @@
 
         #region Api
         
-        public string ApiBaseAddress { get; private set; }
-        public string ApiUsbEndPoint { get; private set; }
+        public string ApiBaseAddress { get; private set; } = null!;
+        public string ApiUsbEndPoint { get; private set; } = null!;
         public uint ApiPort { get; private set; }
 
         #endregion
 
         #region Cache
         
-        public string CacheFileName { get; private set; }
+        public string CacheFileName { get; private set; } = null!;
         public uint MaxRetries { get; private set; }
         public uint MaxEntries { get; private set; }
         public uint RetryPeriod { get; private set; }
@@ -40 +42 @@
         #endregion
 
         #region Detection
-        public string T32ProcessName { get; private set; }
+        public string T32ProcessName { get; private set; } = null!;
         public uint DetectionPeriod { get; private set; }
-        public string T32InfoLocation { get; private set; }
-        public string F32RemExecutable { get; private set; }
+        public string T32InfoLocation { get; private set; } = null!;
+        public string F32RemExecutable { get; private set; } = null!;
         public uint FetchInfoMaxAttempts { get; private set;  }
         public uint FetchInfoAttemptPeriod { get; private set; }
-        public string[] F32RemArguments { get; private set; }
+        public string[] F32RemArguments { get; private set; } = null!;
         public int T32RemSuccessExitCode { get; private set; }
         public int T32RemWaitTimeoutMs { get; private set; }
 
@@ -54 +56 @@
 
         public ConfigLoader() {
             var configuration = new ConfigurationBuilder()
-                .AddJsonFile("appsettings.json")
+                .AddJsonFile(ConfigFile)
                 .Build();
-            ReadAllSettings(configuration);
-        }
 
-        private void ReadAllSettings(IConfiguration configuration) {
+            ReadLoggerSection(configuration);
+            ReadApiSection(configuration);
+            ReadCacheSection(configuration);
+            ReadDebuggerSection(configuration);
+            
+            Console.WriteLine("Configuration successfully loaded!");
+        }
 
+        private void ReadLoggerSection(IConfiguration configuration) {
             try {
                 var logging = configuration.GetSection(LoggingSection);
-                //TODO: Exception handling
                 LogChunkSize = int.Parse(logging["LogChunkSize"]);
                 LogChunkMaxCount = int.Parse(logging["LogChunkMaxCount"]);
                 LogArchiveMaxCount = int.Parse(logging["LogArchiveMaxCount"]);
                 LogCleanupPeriod = int.Parse(logging["LogCleanupPeriod"]);
                 LogFlowType = (LogFlow)int.Parse(logging["LogFlowType"]);
                 LogVerbosityType = (LogVerbosity)int.Parse(logging["LogVerbosityType"]);
+            } catch (Exception e) {
+                Console.WriteLine(e.Message);
+                Environment.Exit(ErrorExitCode);
+            }
+        }
 
+        private void ReadApiSection(IConfiguration configuration) {
+            try {
                 var network = configuration.GetSection(NetworkSection);
                 ApiBaseAddress = network["ApiBaseAddress"];
                 ApiUsbEndPoint = network["ApiLDEndPoint"];
                 ApiPort = uint.Parse(network["ApiPort"]);
-                
+            } catch (Exception e) {
+                Console.WriteLine(e.Message);
+                Environment.Exit(ErrorExitCode);
+            }
+        }
+
+        private void ReadCacheSection(IConfiguration configuration) {
+            try {
                 var cache = configuration.GetSection(CacheSection);
                 RetryPeriod = uint.Parse(cache["RetryPeriod"]);
                 MaxEntries = uint.Parse(cache["MaxEntries"]);
                 MaxRetries = uint.Parse(cache["MaxRetries"]);
                 CacheFileName = cache["CacheFileName"];
-                
+            } catch (Exception e) {
+                Console.WriteLine(e.Message);
+                Environment.Exit(ErrorExitCode);
+            }
+        }
+
+        private void ReadDebuggerSection(IConfiguration configuration) {
+            try {
                 var debugger = configuration.GetSection(DdSection);
                 T32ProcessName = debugger["T32ProcessName"];
                 T32InfoLocation = debugger["T32InfoLocation"];
@@ -92 +119 @@
                 T32RemSuccessExitCode = int.Parse(debugger["T32RemSuccessExitCode"]);
                 T32RemWaitTimeoutMs = int.Parse(debugger["T32RemWaitTimeoutMs"]);
                 F32RemArguments = configuration.GetSection($"{DdSection}:F32RemCommands").GetChildren().Select(key => key.Value).ToArray();
-
-                Console.WriteLine("Configuration successfully loaded!");
-            } catch (FormatException e) {
-                //Console.WriteLine("Error reading app settings");
-                //TODO: remove stacktrace print in production
-                Console.WriteLine("Error during reading of configuration occurred!" + e);
-                throw new IOException("Reading of configuration file failed! " + e);
+            } catch (Exception e) {
+                Console.WriteLine(e);
+                Environment.Exit(ErrorExitCode);
             }
         }
     }