better handling of the db instance (only open once for listeners, don…

…'t over-close)
wtfaremyinitials · Nov 2, 2017 · 5e5c1cf · 5e5c1cf
1 parent 5bdfa5d
commit 5e5c1cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -120,7 +120,10 @@ function listen() {
     let last = packTimeConditionally(appleTimeNow() - 5)
     let bail = false
 
+    const dbPromise = messagesDb.open()
+
     async function check() {
+        const db = await dbPromise
         const query = `
             SELECT
                 guid,
@@ -137,7 +140,6 @@ function listen() {
         last = packTimeConditionally(appleTimeNow())
 
         try {
-            const db = await messagesDb.open()
             const messages = await db.all(query)
             messages.forEach(msg => {
                 if (emittedMsgs[msg.guid]) return

diff --git a/lib/messages-db.js b/lib/messages-db.js
@@ -9,12 +9,14 @@ async function open() {
     return db
 }
 
+let isClosing;
 function cleanUp() {
-    if (db && db.driver.open)
+    if (db && db.driver.open && !isClosing) {
+        isClosing = true
         db.close()
+    }
 }
 process.on('exit', cleanUp)
-process.on('SIGINT', cleanUp)
 process.on('uncaughtException', cleanUp)
 
 module.exports = {