fix: properly handle non existing configuration sections

[e-mobility-charging-stations-simulator.git] / src / utils / Configuration.ts

diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index 4f5e1ef143d96baf2828b3ce7169315049eec493..b54f3900988477d6e0ef77113323fc6c1bd8092a 100644 (file)
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -178,7 +178,7 @@ export class Configuration {
     Configuration.warnDeprecatedConfigurationKey(
       'logRotate',
       undefined,
-      "Use 'log' section to define the log rotation instead"
+      "Use 'log' section to define the log rotation enablement instead"
     );
     Configuration.warnDeprecatedConfigurationKey(
       'logMaxFiles',
@@ -234,7 +234,7 @@ export class Configuration {
     const logConfiguration: LogConfiguration = {
       ...defaultLogConfiguration,
       ...deprecatedLogConfiguration,
-      ...Configuration.getConfig()?.log,
+      ...(Utils.hasOwnProp(Configuration.getConfig(), 'log') && Configuration.getConfig()?.log),
     };
     return logConfiguration;
   }
@@ -321,7 +321,8 @@ export class Configuration {
     const workerConfiguration: WorkerConfiguration = {
       ...defaultWorkerConfiguration,
       ...deprecatedWorkerConfiguration,
-      ...Configuration.getConfig()?.worker,
+      ...(Utils.hasOwnProp(Configuration.getConfig(), 'worker') &&
+        Configuration.getConfig()?.worker),
     };
     return workerConfiguration;
   }