fix connection to database

klips-project · Feb 21, 2024 · 623b85b · 623b85b
1 parent 4d05bf0
commit 623b85b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 41 deletions.
diff --git a/src/create-contour/add-to-table.js b/src/create-contour/add-to-table.js
@@ -21,12 +21,21 @@ export const addData = async (
     }
 
     // Add to table
-    const client = await getClient();
-    // TODO process.argv can potentially be removed
-    const timestamp = process.argv[2] ?? datasetTimestamp;
-    const geom = process.argv[2] ?? contourLine.geometry;
-    const temp = process.argv[2] ?? contourLine.properties.TEMP;
-    let insertRow = await client.query(`INSERT INTO ${region}_contourLines(timestamp, geom, temp) VALUES($1);`, [timestamp, geom, temp]);
-    logger.info(`Inserted ${insertRow.rowCount} row`);
-    await client.end();
+    let client;
+    try {
+        client = await getClient();
+        // TODO process.argv can potentially be removed
+        const timestamp = process.argv[2] ?? datasetTimestamp;
+        const geom = process.argv[2] ?? contourLine.geometry;
+        const temp = process.argv[2] ?? contourLine.properties.TEMP;
+        let insertRow = await client.query(`INSERT INTO ${region}_contourLines(timestamp, geom, temp) VALUES($1);`, [timestamp, geom, temp]);
+        logger.info(`Inserted ${insertRow.rowCount} row`);
+    } catch (e) {
+        logger.error(e);
+        throw 'SQL execution aborted: ' + e;
+    } finally {
+        if (client) {
+            await client.end();
+        }
+    }
 };
diff --git a/src/create-contour/connect.js b/src/create-contour/connect.js
diff --git a/src/create-contour/index.js b/src/create-contour/index.js
@@ -44,21 +44,29 @@ const contourLinesWorker = async (workerJob, inputs) => {
 
     // Create table
     // TODO check if this can be moved to seperate file
-    (async () => {
-        const client = await getClient();
-        let createTableQuery = `
+    let client;
+    try {
+        (async () => {
+            client = await getClient();
+            let createTableQuery = `
     CREATE TABLE IF NOT EXISTS ${region}_contourLines(
       id BIGSERIAL PRIMARY KEY NOT NULL ,
       timestamp timestamp without timezone,
       geom geometry,
       temp number,
     );
   `;
-        const res = await client.query(createTableQuery);
-        logger.info(`Created table.`);
-        logger.info(res.rows[0].connected);
-        await client.end();
-    })();
+            await client.query(createTableQuery);
+            logger.info(`Created table.`);
+        })();
+    } catch (e) {
+        logger.error(e);
+        throw 'SQL execution aborted: ' + e;
+    } finally {
+        if (client) {
+            await client.end();
+        }
+    }
 
     // Add rows to table
     // array aus multiLines als geoJSON