Update to fix Issue #63

- Fixes issue with AgentConfiguration.Read() ignoring the path parameter
- Fixes issue with MTConnectAgentApplication.Run() copying the default config file if the configPath argument is passed through the command line

Author: PatrickRitchie

agent/MTConnect.NET-Applications-Agents/MTConnectAgentApplication.cs

@@ -117,20 +117,23 @@ public void Run(string[] args, bool isBlocking = false)
             }
 
 
-            // Convert Json Configuration File to YAML
-            string jsonConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.JsonFilename);
-            if (File.Exists(jsonConfigPath))
+            if (string.IsNullOrEmpty(configFile))
             {
-                var dummyConfiguration = OnConfigurationFileRead(jsonConfigPath);
-                if (dummyConfiguration != null) dummyConfiguration.SaveYaml();
-            }
+                // Convert Json Configuration File to YAML
+                string jsonConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.JsonFilename);
+                if (File.Exists(jsonConfigPath))
+                {
+                    var dummyConfiguration = OnConfigurationFileRead(jsonConfigPath);
+                    if (dummyConfiguration != null) dummyConfiguration.SaveYaml();
+                }
 
-            // Copy Default Configuration File
-            string yamlConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.YamlFilename);
-            string defaultConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.DefaultYamlFilename);
-            if (!File.Exists(yamlConfigPath) && !File.Exists(jsonConfigPath) && File.Exists(defaultConfigPath))
-            {
-                File.Copy(defaultConfigPath, yamlConfigPath);
+                // Copy Default Configuration File
+                string yamlConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.YamlFilename);
+                string defaultConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AgentConfiguration.DefaultYamlFilename);
+                if (!File.Exists(yamlConfigPath) && !File.Exists(jsonConfigPath) && File.Exists(defaultConfigPath))
+                {
+                    File.Copy(defaultConfigPath, yamlConfigPath);
+                }
             }
 
             // Read the Agent Configuation File

libraries/MTConnect.NET-Common/Configurations/AgentConfiguration.cs

@@ -134,18 +134,30 @@ public AgentConfiguration()
         public static AgentConfiguration ReadYaml(string path = null) => ReadYaml<AgentConfiguration>(path);
 
 
-
         public static T Read<T>(string path = null) where T : AgentConfiguration
         {
-            var jsonPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, JsonFilename);
+            if (!string.IsNullOrEmpty(path))
+            {
+                var configurationPath = path;
+                if (!System.IO.Path.IsPathRooted(configurationPath))
+                {
+                    configurationPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, configurationPath);
+                }
 
-            // Test for JSON Configuration File
-            if (File.Exists(jsonPath)) return ReadJson<T>(jsonPath);
+                return ReadYaml<T>(configurationPath);
+            }
             else
             {
-                var yamlPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, YamlFilename);
+                var jsonPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, JsonFilename);
 
-                return ReadYaml<T>(yamlPath);
+                // Test for JSON Configuration File
+                if (File.Exists(jsonPath)) return ReadJson<T>(jsonPath);
+                else
+                {
+                    var yamlPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, YamlFilename);
+
+                    return ReadYaml<T>(yamlPath);
+                }
             }
         }