Merge pull request #110 from PaystackHQ/chore/slight-error-handling

Chore: Graceful shutdown, return errors

Author: ife-paystack

config/db.js

@@ -3,27 +3,30 @@ const { db: { uri: databaseURI } } = require('./index');
 const logger = require('../helpers/logger');
 const { gracefulShutdown } = require('../helpers/util');
 
-const conn = async function connection() {
+async function connect() {
   logger.info('connecting to database');
-  await mongoose.connect(databaseURI);
-};
-
-try {
-  conn();
-} catch (error) {
-  logger.error(error);
+  return mongoose.connect(databaseURI);
 }
 
+let connection = null;
+
+(async () => {
+  try {
+    connection = await connect();
+    logger.info('connected to database');
+  } catch (error) {
+    logger.error(error);
+  }
+})();
+
 // graceful shutdown for nodemon restarts
 process.once('SIGUSR2', () => {
-  gracefulShutdown(conn, 'nodemon restart', logger.info, () => {
-    process.kill(process.pid, 'SIGUSR2');
-  });
+  gracefulShutdown(connection, 'nodemon restart', logger.info);
+  process.kill(process.pid, 'SIGUSR2');
 });
 
 // graceful shutdown for app termination
 process.on('SIGINT', () => {
-  gracefulShutdown(conn, 'app termination', logger.info, () => {
-    process.exit(0);
-  });
+  gracefulShutdown(connection, 'app termination', logger.info);
+  process.exit(0);
 });

controllers/index.js

@@ -77,6 +77,7 @@ module.exports = {
       slack.sendMonitorMessage(stringError);
       return res.status(500).send({
         message: 'Trigger is broken, check Slack',
+        error,
       });
     }
   },

helpers/util.js

@@ -53,11 +53,9 @@ function sleep(durationInMs) {
  * @param {string} msg
  * @param {string} cb
  */
-function gracefulShutdown(conn, msg, infoLogger, cb) {
-  conn.close(() => {
-    infoLogger(`Mongoose disconnected through ${msg}`);
-    cb();
-  });
+function gracefulShutdown(conn, msg, infoLogger) {
+  conn.disconnect();
+  infoLogger(`Mongoose disconnected through ${msg}`);
 }
 
 /**