@ejfdelgado/ejflab-back 1.27.1 → 1.27.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.27.1",
+  "version": "1.27.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/MainHandler.mjs

@@ -106,7 +106,9 @@ export class MainHandler {
             if (rootFolder) {
                 options.push(path.join(rootFolder, filename));
             }
-            options.push(path.join(MainHandler.LOCAL_FOLDER1, filename));
+            if (process.env.ENV != "pro") {
+                options.push(path.join(MainHandler.LOCAL_FOLDER1, filename));
+            }
             options.push(path.join(MainHandler.LOCAL_FOLDER, filename));
 
             // Check which exists first, if not resolve null with log
@@ -122,6 +124,7 @@ export class MainHandler {
             if (!selected) {
                 console.log(`Files not found ${options}`);
                 resolve(null);
+                return;
             }
 
             const somePath = selected;

package/srv/PostgresSrv.mjs

@@ -85,7 +85,7 @@ export class PostgresSrv {
     }
 
     static async executeTextInTransaction(sql, model = {}) {
-        const pool = PostgresSrv.getPool();
+        const pool = await PostgresSrv.getPool();
         const client = await pool.connect();
         await client.query("BEGIN");
         try {
@@ -106,7 +106,7 @@ export class PostgresSrv {
         console.log(sqlRendered);
         let localClient = false;
         if (!client) {
-            const pool = PostgresSrv.getPool();
+            const pool = await PostgresSrv.getPool();
             localClient = true;
             client = await pool.connect();
         }
@@ -127,16 +127,26 @@ export class PostgresSrv {
         return await PostgresSrv.executeTextInTransaction(sql, model);
     }
 
-    static getPool() {
+    static createPool() {
+        const params = PostgresSrv.getConnectionParams();
+        PostgresSrv.pool = new Pool({
+            user: params.user,
+            password: params.password,
+            host: params.host,
+            port: params.port,
+            database: params.database,
+        });
+    }
+
+    static async getPool() {
         if (PostgresSrv.pool == null) {
-            const params = PostgresSrv.getConnectionParams();
-            PostgresSrv.pool = new Pool({
-                user: params.user,
-                password: params.password,
-                host: params.host,
-                port: params.port,
-                database: params.database,
-            });
+            PostgresSrv.createPool();
+        }
+        try {
+            await PostgresSrv.pool.query('SELECT 1;');
+        } catch (err) {
+            console.log(err);
+            PostgresSrv.createPool();
         }
         return PostgresSrv.pool;
     }