X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fperformance%2Fstorage%2FStorage.ts;h=d85d8c415efdd1b254694976597bfd722af4c42d;hb=6c1761d470507ea23d186be61b94ca7375c5144a;hp=ff299fac5319f2d2fdb0ea9599c2cd72f6cf0af8;hpb=a6b3c6c313f1c0314a1445ed630cac85edf55b2c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/Storage.ts b/src/performance/storage/Storage.ts
index ff299fac..d85d8c41 100644
--- a/src/performance/storage/Storage.ts
+++ b/src/performance/storage/Storage.ts
@@ -1,24 +1,41 @@
 // Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { DBName, StorageType } from '../../types/Storage';
-
-import Statistics from '../../types/Statistics';
 import { URL } from 'url';
-import Utils from '../../utils/Utils';
+
+import type { EmptyObject } from '../../types/EmptyObject';
+import type { HandleErrorParams } from '../../types/Error';
+import type Statistics from '../../types/Statistics';
+import { DBName, StorageType } from '../../types/Storage';
 import logger from '../../utils/Logger';
+import Utils from '../../utils/Utils';
 
 export abstract class Storage {
-  protected readonly storageURI: URL;
+  protected readonly storageUri: URL;
   protected readonly logPrefix: string;
   protected dbName: string;
 
-  constructor(storageURI: string, logPrefix: string) {
-    this.storageURI = new URL(storageURI);
+  constructor(storageUri: string, logPrefix: string) {
+    this.storageUri = new URL(storageUri);
     this.logPrefix = logPrefix;
   }
 
-  protected handleDBError(type: StorageType, error: Error, table?: string): void {
-    logger.error(`${this.logPrefix} ${this.getDBNameFromStorageType(type)} error '${error.message}'${(!Utils.isNullOrUndefined(table) || !table) && ` in table or collection '${table}'`}: %j`, error);
+  protected handleDBError(
+    type: StorageType,
+    error: Error,
+    table?: string,
+    params: HandleErrorParams<EmptyObject> = { throwError: false }
+  ): void {
+    const inTableOrCollectionStr =
+      (!Utils.isNullOrUndefined(table) || !table) && ` in table or collection '${table}'`;
+    logger.error(
+      `${this.logPrefix} ${this.getDBNameFromStorageType(type)} error '${
+        error.message
+      }'${inTableOrCollectionStr}:`,
+      error
+    );
+    if (params?.throwError) {
+      throw error;
+    }
   }
 
   protected getDBNameFromStorageType(type: StorageType): DBName {
@@ -36,5 +53,7 @@ export abstract class Storage {
 
   public abstract open(): void | Promise<void>;
   public abstract close(): void | Promise<void>;
-  public abstract storePerformanceStatistics(performanceStatistics: Statistics): void | Promise<void>;
+  public abstract storePerformanceStatistics(
+    performanceStatistics: Statistics
+  ): void | Promise<void>;
 }