X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.ts;h=e4215f94c973e3be09c6283d9773e489067105d7;hb=60655b2618d2d049b20efb78c1a75a75c2874db6;hp=257f5f658fe9819be910ec5b3d63e6d9ab79f2ae;hpb=51022aa0d811eec79514fbeb56cb9556e7168cd7;p=e-mobility-charging-stations-simulator.git diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts index 257f5f65..e4215f94 100644 --- a/src/utils/Configuration.ts +++ b/src/utils/Configuration.ts @@ -36,11 +36,11 @@ export class Configuration { // This is intentional } - static setConfigurationChangeCallback(cb: () => Promise): void { + public static setConfigurationChangeCallback(cb: () => Promise): void { Configuration.configurationChangeCallback = cb; } - static getLogStatisticsInterval(): number | undefined { + public static getLogStatisticsInterval(): number | undefined { Configuration.warnDeprecatedConfigurationKey( 'statisticsDisplayInterval', undefined, @@ -52,7 +52,7 @@ export class Configuration { : Constants.DEFAULT_LOG_STATISTICS_INTERVAL; } - static getUIServer(): UIServerConfiguration { + public static getUIServer(): UIServerConfiguration { if (Utils.hasOwnProp(Configuration.getConfig(), 'uiWebSocketServer')) { console.error( chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration section 'uiWebSocketServer' usage. Use 'uiServer' instead}` @@ -79,7 +79,7 @@ export class Configuration { return uiServerConfiguration; } - static getPerformanceStorage(): StorageConfiguration { + public static getPerformanceStorage(): StorageConfiguration { Configuration.warnDeprecatedConfigurationKey('URI', 'performanceStorage', "Use 'uri' instead"); let storageConfiguration: StorageConfiguration = { enabled: false, @@ -101,7 +101,7 @@ export class Configuration { return storageConfiguration; } - static getAutoReconnectMaxRetries(): number | undefined { + public static getAutoReconnectMaxRetries(): number | undefined { Configuration.warnDeprecatedConfigurationKey( 'autoReconnectTimeout', undefined, @@ -123,7 +123,7 @@ export class Configuration { } } - static getStationTemplateUrls(): StationTemplateUrl[] | undefined { + public static getStationTemplateUrls(): StationTemplateUrl[] | undefined { Configuration.warnDeprecatedConfigurationKey( 'stationTemplateURLs', undefined, @@ -148,7 +148,7 @@ export class Configuration { return Configuration.getConfig()?.stationTemplateUrls; } - static getWorker(): WorkerConfiguration { + public static getWorker(): WorkerConfiguration { Configuration.warnDeprecatedConfigurationKey( 'useWorkerPool', undefined, @@ -222,7 +222,17 @@ export class Configuration { return workerConfiguration; } - static getLogConsole(): boolean | undefined { + public static workerPoolInUse(): boolean { + return [WorkerProcessType.dynamicPool, WorkerProcessType.staticPool].includes( + Configuration.getWorker().processType + ); + } + + public static workerDynamicPoolInUse(): boolean { + return Configuration.getWorker().processType === WorkerProcessType.dynamicPool; + } + + public static getLogConsole(): boolean | undefined { Configuration.warnDeprecatedConfigurationKey( 'consoleLog', undefined, @@ -233,45 +243,45 @@ export class Configuration { : false; } - static getLogFormat(): string | undefined { + public static getLogFormat(): string | undefined { return Utils.hasOwnProp(Configuration.getConfig(), 'logFormat') ? Configuration.getConfig()?.logFormat : 'simple'; } - static getLogRotate(): boolean | undefined { + public static getLogRotate(): boolean | undefined { return Utils.hasOwnProp(Configuration.getConfig(), 'logRotate') ? Configuration.getConfig()?.logRotate : true; } - static getLogMaxFiles(): number | string | false | undefined { + public static getLogMaxFiles(): number | string | false | undefined { return ( Utils.hasOwnProp(Configuration.getConfig(), 'logMaxFiles') && Configuration.getConfig()?.logMaxFiles ); } - static getLogMaxSize(): number | string | false | undefined { + public static getLogMaxSize(): number | string | false | undefined { return ( Utils.hasOwnProp(Configuration.getConfig(), 'logMaxFiles') && Configuration.getConfig()?.logMaxSize ); } - static getLogLevel(): string | undefined { + public static getLogLevel(): string | undefined { return Utils.hasOwnProp(Configuration.getConfig(), 'logLevel') ? Configuration.getConfig()?.logLevel?.toLowerCase() : 'info'; } - static getLogFile(): string | undefined { + public static getLogFile(): string | undefined { return Utils.hasOwnProp(Configuration.getConfig(), 'logFile') ? Configuration.getConfig()?.logFile : 'combined.log'; } - static getLogErrorFile(): string | undefined { + public static getLogErrorFile(): string | undefined { Configuration.warnDeprecatedConfigurationKey( 'errorFile', undefined, @@ -282,7 +292,7 @@ export class Configuration { : 'error.log'; } - static getSupervisionUrls(): string | string[] | undefined { + public static getSupervisionUrls(): string | string[] | undefined { Configuration.warnDeprecatedConfigurationKey( 'supervisionURLs', undefined, @@ -296,7 +306,7 @@ export class Configuration { return Configuration.getConfig()?.supervisionUrls; } - static getSupervisionUrlDistribution(): SupervisionUrlDistribution | undefined { + public static getSupervisionUrlDistribution(): SupervisionUrlDistribution | undefined { Configuration.warnDeprecatedConfigurationKey( 'distributeStationToTenantEqually', undefined, @@ -403,10 +413,14 @@ export class Configuration { case 'EACCES': logMsg = `${fileType} file ${file} access denied:`; break; + case 'EPERM': + logMsg = `${fileType} file ${file} permission denied:`; + break; default: logMsg = `${fileType} file ${file} error:`; } - console.warn(`${chalk.green(prefix)}${chalk.yellow(`${logMsg} `)}`, error); + console.error(`${chalk.green(prefix)}${chalk.red(`${logMsg} `)}`, error); + throw error; } private static getDefaultPerformanceStorageUri(storageType: StorageType) {