From 67271d1c3b80500a3bc174988b5596eb7fba480e Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sat, 12 Sep 2020 22:10:05 +0300
Subject: [PATCH] use sql connection pool to help with script stalling;

---
 src/db/devicemessages.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/db/devicemessages.js b/src/db/devicemessages.js
index 3856b2d..c7238ad 100644
--- a/src/db/devicemessages.js
+++ b/src/db/devicemessages.js
@@ -24,14 +24,17 @@ exports.findByName = function(fieldName, days, cb) {
     // console.log("findByName(" +fieldName + ",?" + days +")" );
     // days = days|365;
     console.log("findByName(" +fieldName + "," + days +")" );
-    con.query("SELECT * FROM devicemessages WHERE (field_name=? OR ? IS NULL) AND (timestamp >= ( CURDATE() - INTERVAL ? DAY ))", 
-      [fieldName, fieldName, days], (err, data) => {
-      if (!err) {
-          cb(null, data);
-      } else {
-          cb(new Error('SQL Error: ' + err));
-      }
+    pool.getConnection(function(err, con) {
+      if (err) throw err; // not connected!
+      con.query("SELECT * FROM devicemessages WHERE (field_name=? OR ? IS NULL) AND (timestamp >= ( CURDATE() - INTERVAL ? DAY ))", [fieldName, fieldName, days], (err, data) => {
+        con.release();
+        if (!err) {
+            cb(null, data);
+        } else {
+            cb(new Error('SQL Error: ' + err));
+        }
       });
+    });
   });
 }
 
@@ -39,7 +42,7 @@ exports.insert = function(device_id, field_name, value, cb){
     var params = [device_id, field_name,value];
     let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp)
     VALUES (?,?,?,NOW());`;
-    pool.getConnection(function(err, conn) {
+    pool.getConnection(function(err, con) {
       if (err) throw err; // not connected!
       con.query(sql,params,(err, r) => {
         con.release();