Improve OCPP error handling, fix performance storage default file path

[e-mobility-charging-stations-simulator.git] / src / performance / storage / Storage.ts

diff --git a/src/utils/performance-storage/Storage.ts b/src/performance/storage/Storage.ts
similarity index 61%
rename from src/utils/performance-storage/Storage.ts
rename to src/performance/storage/Storage.ts
index 160e01d8bdc435adf68dbb782e22169a1f3676cc..ff299fac5319f2d2fdb0ea9599c2cd72f6cf0af8 100644 (file)
--- a/src/utils/performance-storage/Storage.ts
+++ b/src/performance/storage/Storage.ts
@@ -1,11 +1,11 @@
 // Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { DBType, StorageType } from '../../types/Storage';
+import { DBName, StorageType } from '../../types/Storage';
 
 import Statistics from '../../types/Statistics';
 import { URL } from 'url';
-import Utils from '../Utils';
-import logger from '../Logger';
+import Utils from '../../utils/Utils';
+import logger from '../../utils/Logger';
 
 export abstract class Storage {
   protected readonly storageURI: URL;
@@ -18,19 +18,19 @@ export abstract class Storage {
   }
 
   protected handleDBError(type: StorageType, error: Error, table?: string): void {
-    logger.error(`${this.logPrefix} ${this.getDBTypeFromStorageType(type)} error${(!Utils.isNullOrUndefined(table) || !table) && ` in table or collection '${table}'`} %j`, error);
+    logger.error(`${this.logPrefix} ${this.getDBNameFromStorageType(type)} error '${error.message}'${(!Utils.isNullOrUndefined(table) || !table) && ` in table or collection '${table}'`}: %j`, error);
   }
 
-  protected getDBTypeFromStorageType(type: StorageType): DBType {
+  protected getDBNameFromStorageType(type: StorageType): DBName {
     switch (type) {
       case StorageType.MARIA_DB:
-        return DBType.MARIA_DB;
+        return DBName.MARIA_DB;
       case StorageType.MONGO_DB:
-        return DBType.MONGO_DB;
+        return DBName.MONGO_DB;
       case StorageType.MYSQL:
-        return DBType.MYSQL;
+        return DBName.MYSQL;
       case StorageType.SQLITE:
-        return DBType.SQLITE;
+        return DBName.SQLITE;
     }
   }