better logs in configService

Engineering-Research-and-Development · Feb 28, 2024 · 7230eb3 · 7230eb3
1 parent 7fd1f97
commit 7230eb3
Showing 1 changed file with 27 additions and 21 deletions.
diff --git a/lib/configService.js b/lib/configService.js
@@ -89,27 +89,6 @@ function processEnvironmentVariables() {
     protectedVariables.forEach((key) => {
         iotAgentLib.configModule.getSecretData(key);
     });
-    iotaVariables.forEach((key) => {
-        let value = process.env[key];
-        if (value) {
-            logger.info('Setting IoTAgent Lib environment variable %s to environment value: %s', key, value);
-        }
-    });
-    opcUAVariables.forEach((key) => {
-        let value = process.env[key];
-        if (value) {
-            if (key.endsWith('USERNAME') || key.endsWith('PASSWORD') || key.endsWith('KEY')) {
-                value = '********';
-            }
-            logger.info('Setting opcUA environment variable %s to environment value: %s', key, value);
-        }
-    });
-    mappingToolVariables.forEach((key) => {
-        let value = process.env[key];
-        if (value) {
-            logger.info('Setting mappingTool environment variable %s to environment value: %s', key, value);
-        }
-    });
 
     if (process.env.IOTA_CONFIG_RETRIEVAL) {
         config.configRetrieval = process.env.IOTA_CONFIG_RETRIEVAL;
@@ -128,8 +107,16 @@ function processEnvironmentVariables() {
             deviceRegistry: {},
             mongodb: {}
         };
+        logger.info('Config.iota erased', config.iota);
     }
 
+    iotaVariables.forEach((key) => {
+        let value = process.env[key];
+        if (value) {
+            logger.info('Setting IoTAgent Lib environment variable %s to environment value: %s', key, value);
+        }
+    });
+
     if (process.env.IOTA_LOGLEVEL) {
         config.iota.logLevel = process.env.IOTA_LOGLEVEL;
     }
@@ -222,8 +209,19 @@ function processEnvironmentVariables() {
         config.opcua = {
             subscription: {}
         };
+        logger.info('Config.opcua erased', config.opcua);
     }
 
+    opcUAVariables.forEach((key) => {
+        let value = process.env[key];
+        if (value) {
+            if (key.endsWith('USERNAME') || key.endsWith('PASSWORD') || key.endsWith('KEY')) {
+                value = '********';
+            }
+            logger.info('Setting opcUA environment variable %s to environment value: %s', key, value);
+        }
+    });
+
     if (process.env.IOTA_OPCUA_ENDPOINT) {
         config.opcua.endpoint = process.env.IOTA_OPCUA_ENDPOINT;
     }
@@ -274,8 +272,16 @@ function processEnvironmentVariables() {
 
     if (anyIsSet(mappingToolVariables)) {
         config.mappingTool = {};
+        logger.info('Config.mappingTool erased', config.mappingTool);
     }
 
+    mappingToolVariables.forEach((key) => {
+        let value = process.env[key];
+        if (value) {
+            logger.info('Setting mappingTool environment variable %s to environment value: %s', key, value);
+        }
+    });
+
     if (process.env.IOTA_OPCUA_MT_POLLING) {
         config.mappingTool.polling = process.env.IOTA_OPCUA_MT_POLLING;
     }