repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refine comment at CS configuration file handling
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Configuration.ts
diff --git
a/src/utils/Configuration.ts
b/src/utils/Configuration.ts
index 7309ec2f1c9303232d30e0de3de66119a738fc09..9ab2582d140d54ddb068aaac229aeba9577734b1 100644
(file)
--- a/
src/utils/Configuration.ts
+++ b/
src/utils/Configuration.ts
@@
-7,6
+7,7
@@
import ConfigurationData, {
import Constants from './Constants';
import { EmptyObject } from '../types/EmptyObject';
import Constants from './Constants';
import { EmptyObject } from '../types/EmptyObject';
+import { FileType } from '../types/FileType';
import { HandleErrorParams } from '../types/Error';
import { ServerOptions } from 'ws';
import { StorageType } from '../types/Storage';
import { HandleErrorParams } from '../types/Error';
import { ServerOptions } from 'ws';
import { StorageType } from '../types/Storage';
@@
-18,7
+19,7
@@
import fs from 'fs';
import path from 'path';
export default class Configuration {
import path from 'path';
export default class Configuration {
- private static configurationFile
Path
= path.join(
+ private static configurationFile = path.join(
path.resolve(__dirname, '../'),
'assets',
'config.json'
path.resolve(__dirname, '../'),
'assets',
'config.json'
@@
-41,7
+42,7
@@
export default class Configuration {
// Read conf
return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logStatisticsInterval')
? Configuration.getConfig().logStatisticsInterval
// Read conf
return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logStatisticsInterval')
? Configuration.getConfig().logStatisticsInterval
- :
60
;
+ :
Constants.DEFAULT_LOG_STATISTICS_INTERVAL
;
}
static getUIWebSocketServer(): UIWebSocketServerConfiguration {
}
static getUIWebSocketServer(): UIWebSocketServerConfiguration {
@@
-159,9
+160,9
@@
export default class Configuration {
static getWorkerProcess(): WorkerProcessType {
Configuration.warnDeprecatedConfigurationKey(
static getWorkerProcess(): WorkerProcessType {
Configuration.warnDeprecatedConfigurationKey(
- 'useWorkerPool
;
',
+ 'useWorkerPool',
null,
null,
- "Use 'workerProcess' to define the type of worker process to use instead"
+ "Use 'workerProcess' to define the type of worker process
model
to use instead"
);
return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerProcess')
? Configuration.getConfig().workerProcess
);
return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerProcess')
? Configuration.getConfig().workerProcess
@@
-299,9
+300,9
@@
export default class Configuration {
if (
sectionName &&
!Configuration.isUndefined(Configuration.getConfig()[sectionName]) &&
if (
sectionName &&
!Configuration.isUndefined(Configuration.getConfig()[sectionName]) &&
- !Configuration.isUndefined(
Configuration.getConfig()[sectionName] as Record<string, unknown>)[
- key
- ]
+ !Configuration.isUndefined(
+ (Configuration.getConfig()[sectionName] as Record<string, unknown>)[key]
+ )
) {
console.error(
chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration key '${key}' usage in section '${sectionName}'${
) {
console.error(
chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration key '${key}' usage in section '${sectionName}'${
@@
-322,13
+323,13
@@
export default class Configuration {
if (!Configuration.configuration) {
try {
Configuration.configuration = JSON.parse(
if (!Configuration.configuration) {
try {
Configuration.configuration = JSON.parse(
- fs.readFileSync(Configuration.configurationFile
Path
, 'utf8')
+ fs.readFileSync(Configuration.configurationFile, 'utf8')
) as ConfigurationData;
} catch (error) {
Configuration.handleFileException(
Configuration.logPrefix(),
) as ConfigurationData;
} catch (error) {
Configuration.handleFileException(
Configuration.logPrefix(),
-
'Configuration'
,
- Configuration.configurationFile
Path
,
+
FileType.Configuration
,
+ Configuration.configurationFile,
error as NodeJS.ErrnoException
);
}
error as NodeJS.ErrnoException
);
}
@@
-341,7
+342,7
@@
export default class Configuration {
private static getConfigurationFileWatcher(): fs.FSWatcher {
try {
private static getConfigurationFileWatcher(): fs.FSWatcher {
try {
- return fs.watch(Configuration.configurationFile
Path
, (event, filename): void => {
+ return fs.watch(Configuration.configurationFile, (event, filename): void => {
if (filename && event === 'change') {
// Nullify to force configuration file reading
Configuration.configuration = null;
if (filename && event === 'change') {
// Nullify to force configuration file reading
Configuration.configuration = null;
@@
-355,9
+356,9
@@
export default class Configuration {
} catch (error) {
Configuration.handleFileException(
Configuration.logPrefix(),
} catch (error) {
Configuration.handleFileException(
Configuration.logPrefix(),
-
'Configuration'
,
- Configuration.configurationFile
Path
,
- error as
Error
+
FileType.Configuration
,
+ Configuration.configurationFile,
+ error as
NodeJS.ErrnoException
);
}
}
);
}
}
@@
-387,7
+388,7
@@
export default class Configuration {
private static handleFileException(
logPrefix: string,
private static handleFileException(
logPrefix: string,
- fileType:
string
,
+ fileType:
FileType
,
filePath: string,
error: NodeJS.ErrnoException,
params: HandleErrorParams<EmptyObject> = { throwError: true }
filePath: string,
error: NodeJS.ErrnoException,
params: HandleErrorParams<EmptyObject> = { throwError: true }