close connections properly

WietseWind · Jul 20, 2023 · 8dbf31d · 8dbf31d
1 parent 9e94722
commit 8dbf31d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -178,23 +178,27 @@ Client.ready().then(Connection => {
         })
 
         // console.dir(Transactions[0], { depth: null })
+        // Connection.close()
         // process.exit(1)
 
         bigquery.dataset(DATASET_NAME).table(TRANSACTION_TABLE_NAME).insert(Transactions)
           .then(r => {
             console.log(`Inserted rows`, r)
             LastLedger = Result.ledger_index
+            // Connection.close()
             // process.exit(0)
           })
           .catch(err => {
             if (err && err.name === 'PartialFailureError') {
               if (err.errors && err.errors.length > 0) {
                 console.log('Insert errors:')
                 err.errors.forEach(err => console.dir(err, { depth: null }))
+                Connection.close()
                 process.exit(1)
               }
             } else {
               console.error('ERROR:', err)
+              Connection.close()
               process.exit(1)
             }
           })
@@ -203,12 +207,14 @@ Client.ready().then(Connection => {
       // retryTimeout = 0
 
       if (Stopped) {
+        Connection.close()
         return
       }
 
       return run(ledger_index + 1)
     }).catch(e => {
       console.log(e)
+      Connection.close()
       process.exit(1)
 
       // retryTimeout += 500
@@ -240,14 +246,14 @@ Client.ready().then(Connection => {
     }
   }).catch(e => {
     console.log('Google BigQuery Error', e)
+    Connection.close()
     process.exit(1)
   })
 
   process.on('SIGINT', function() {
     console.log(`\nGracefully shutting down from SIGINT (Ctrl+C)\n -- Wait for remaining BigQuery inserts and XRPL Connection close...`);
 
     Stopped = true  
-    Connection.close()
     if (LastLedger > 0) {
       console.log(`\nLast ledger: [ ${LastLedger} ]\n\nRun your next job with ENV: "LEDGER=${LastLedger+1}"\n\n`)
     }

diff --git a/ledgerInfo.js b/ledgerInfo.js
@@ -55,30 +55,35 @@ Client.ready().then(Connection => {
         .then(r => {
           console.log(`Inserted rows`, r)
           LastLedger = Result.ledger_index
+          // Connection.close()
           // process.exit(0)
         })
         .catch(err => {
           if (err && err.name === 'PartialFailureError') {
             if (err.errors && err.errors.length > 0) {
               console.log('Insert errors:')
               err.errors.forEach(err => console.dir(err, { depth: null }))
+              Connection.close()
               process.exit(1)
             }
           } else {
             console.error('ERROR:', err)
+            Connection.close()
             process.exit(1)
           }
         })
 
 //      retryTimeout = 0
 
       if (Stopped) {
+        Connection.close()
         return
       }
 
       return run(ledger_index + 1)
     }).catch(e => {
       console.log(e)
+      Connection.close()
       process.exit(1)
 
       // retryTimeout += 500
@@ -107,14 +112,14 @@ Client.ready().then(Connection => {
     }
   }).catch(e => {
     console.log('Google BigQuery Error', e)
+    Connection.close()
     process.exit(1)
   })
 
   process.on('SIGINT', function() {
     console.log(`\nGracefully shutting down from SIGINT (Ctrl+C)\n -- Wait for remaining BigQuery inserts and XRPL Connection close...`);
 
     Stopped = true  
-    Connection.close()
     if (LastLedger > 0) {
       console.log(`\nLast ledger: [ ${LastLedger} ]\n\nRun your next job with ENV: "LEDGER=${LastLedger+1}"\n\n`)
     }