@breautek/storm 9.6.0 → 9.6.2

package/src/DatabaseConnection.ts

@@ -26,6 +26,8 @@ import { IDatabasePosition } from './IDatabasePosition';
 
 export const LINGER_WARNING: number = 60000;
 export const DEFAULT_QUERY_TIMEOUT: number = 3600000;
+export const RECURRING_WARNING_TIMER: number = 60000;
+
 const TAG: string = 'DatabaseConnection';
 
 /**
@@ -39,6 +41,7 @@ export abstract class DatabaseConnection<TAPI> implements IDatabaseConnection {
     private $readOnly: boolean;
     private $timeout: number;
     private $lingerTimer: NodeJS.Timeout;
+    private $lingerInterval: NodeJS.Timeout;
     private $instantiationStack: string;
     private $open: boolean;
 
@@ -81,13 +84,20 @@ export abstract class DatabaseConnection<TAPI> implements IDatabaseConnection {
         return this.$instantiationStack;
     }
 
+    private $disarmLingerWarnings(): void {
+        clearTimeout(this.$lingerTimer);
+        clearInterval(this.$lingerInterval);
+    }
+
     private $armLingerWarning(): void {
-        if (this.$lingerTimer) {
-            clearTimeout(this.$lingerTimer);
-        }
+        this.$disarmLingerWarnings();
 
         this.$lingerTimer = setTimeout(() => {
             this.$triggerLingerWarning();
+
+            this.$lingerInterval = setInterval(() => {
+                this.$triggerLingerWarning();
+            }, RECURRING_WARNING_TIMER);
         }, LINGER_WARNING);
     }
 
@@ -190,14 +200,15 @@ export abstract class DatabaseConnection<TAPI> implements IDatabaseConnection {
      * @async
      * @returns Promise<void>
      */
-    public close(forceClose: boolean = false): Promise<void> {
+    public async close(forceClose: boolean = false): Promise<void> {
         if (this.isClosed()) {
-            return Promise.resolve();
+            return;
         }
         
+        await this._close(forceClose);
+        
         this.$open = false;
-        clearTimeout(this.$lingerTimer);
-        return this._close(forceClose);
+        this.$disarmLingerWarnings();
     }
 
     /**