Changed logging and add schedule

Author: Hamid Tavakoli

connect/service.js

@@ -4,6 +4,7 @@
 
 const sgMail = require('@sendgrid/mail');
 const config = require('config');
+const logger = require('../src/common/logger');
 
 // set api key for SendGrid email client
 sgMail.setApiKey(config.SENDGRID_API_KEY);
@@ -49,7 +50,8 @@ const sendEmail = async (templateId, message) => { // send email
       bcc,
     };
   }
-  return await sgMail.send(msg)
+  logger.info(`Sending email with templateId: ${templateId} and message: ${JSON.stringify(msg)}`);
+  return sgMail.send(msg)
 }
 module.exports = {
   sendEmail,

index.js

@@ -5,10 +5,11 @@ const express = require('express');
 const _ = require('lodash');
 const cors = require('cors');
 const bodyParser = require('body-parser');
+const schedule = require('node-schedule');
 const helper = require('./src/common/helper');
 const logger = require('./src/common/logger');
 const errors = require('./src/common/errors');
-const { initServer } = require('./src/init');
+const { initServer, retryEmail } = require('./src/init');
 
 config.TEMPLATE_MAP = JSON.parse(config.TEMPLATE_MAP);
 
@@ -142,9 +143,14 @@ function start() {
       throw new errors.ValidationError('Missing handler(s).');
     }
 
-    // schedule.scheduleJob(config.EMAIL_RETRY_SCHEDULE, function () {
-    //   app.retryEmail(handlers).catch((err) => logger.error(err));
-    // });
+    schedule.scheduleJob(config.EMAIL_RETRY_SCHEDULE, async function () {
+      try {
+        await retryEmail(handlers)
+      } catch (err) {
+        console.log(err);
+        logger.error(err);
+      }
+    });
     app.listen(app.get('port'), () => {
       logger.info(`Express server listening on port ${app.get('port')}`);
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tc-email",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Topcoder Email Services",
   "main": "index.js",
   "scripts": {

src/init.js

@@ -78,7 +78,6 @@ async function dataHandler(consumer, handlers) {
           status: result.success ? 'Message accepted' : 'Message rejected',
           error: result.error ? result.error.toString() : 'No error message',
         });
-        console.log("******************* result *******************", result)
 
         if (result.success) {
           emailTries[topicName] = 0;
@@ -101,31 +100,31 @@ async function dataHandler(consumer, handlers) {
     },
   })
 
-  // const errorTypes = ['unhandledRejection', 'uncaughtException']
-  // const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
-
-  // errorTypes.forEach(type => {
-  //   process.on(type, async e => {
-  //     try {
-  //       console.log(`process.on ${type}`)
-  //       console.error(e)
-  //       await consumer.disconnect()
-  //       process.exit(0)
-  //     } catch (_) {
-  //       process.exit(1)
-  //     }
-  //   })
-  // })
-
-  // signalTraps.forEach(type => {
-  //   process.once(type, async () => {
-  //     try {
-  //       await consumer.disconnect()
-  //     } finally {
-  //       process.kill(process.pid, type)
-  //     }
-  //   })
-  // })
+  const errorTypes = ['unhandledRejection', 'uncaughtException']
+  const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2']
+
+  errorTypes.forEach(type => {
+    process.on(type, async e => {
+      try {
+        console.log(`process.on ${type}`)
+        console.error(e)
+        await consumer.disconnect()
+        process.exit(0)
+      } catch (_) {
+        process.exit(1)
+      }
+    })
+  })
+
+  signalTraps.forEach(type => {
+    process.once(type, async () => {
+      try {
+        await consumer.disconnect()
+      } finally {
+        process.kill(process.pid, type)
+      }
+    })
+  })
 
 }
 
@@ -135,11 +134,12 @@ async function dataHandler(consumer, handlers) {
  * @param {Object} handlers the handlers
  */
 async function retryEmail(handlers) {
-  const models = await models.Email.findAll({ where: { status: 'FAILED', createdAt: { $gt: new Date(new Date() - config.EMAIL_RETRY_MAX_AGE) } } })
+  const loader = await models.loadEmailModule()
+  const emailModel = await loader.findAll({ where: { status: 'FAILED', createdAt: { $gt: new Date(new Date() - config.EMAIL_RETRY_MAX_AGE) } } })
 
-  if (models.length > 0) {
-    logger.info(`Found ${models.length} e-mails to be resent`);
-    models.map(async m => {
+  if (emailModel.length > 0) {
+    logger.info(`Found ${emailModel.length} e-mails to be resent`);
+    emailModel.map(async m => {
       // find handler
       const handler = handlers[m.topicName];
       if (!handler) {

src/models/Email.js

@@ -1,12 +1,12 @@
 /**
- * Copyright (C) 2018 Topcoder Inc., All Rights Reserved.
+ * Copyright (C) 2022 Topcoder Inc., All Rights Reserved.
  */
 
 /**
  * Init  datasource
  *
  * @author      TCSCODER
- * @version     1.0
+ * @version     2.0
  */
 
 const config = require('config');

src/models/datasource.js

@@ -1,17 +1,24 @@
 /**
- * Copyright (C) 2018 TopCoder Inc., All Rights Reserved.
+ * Copyright (C) 2022TopCoder Inc., All Rights Reserved.
  */
 
-/**
- * the sequelize schema index
- *
- * @author      TCSCODER
- * @version     1.0
- */
+
 
 const sequelizeInstance = require('./datasource');
 const DataTypes = require('sequelize/lib/data-types');
-const defineEmailModel = require('./Email')
+const logger = require('../common/logger');
+
+async function defineEmailModel(sequelize, DataTypes) {
+  const Email = sequelize.define('Email', {
+    id: { type: DataTypes.BIGINT, primaryKey: true, autoIncrement: true },
+    topicName: { type: DataTypes.STRING, allowNull: true, field: 'topic_name' },
+    data: { type: DataTypes.TEXT, allowNull: false },
+    recipients: { type: DataTypes.STRING, allowNull: false },
+    status: { type: DataTypes.STRING, allowNull: false },
+  });
+  await Email.sync();
+  return Email;
+}
 
 async function loadSequelizeModule() {
   return await sequelizeInstance.getSequelize();
@@ -22,6 +29,7 @@ async function loadEmailModule() {
 }
 
 async function init() {
+  logger.info("Initializing models");
   const sequelize = await loadSequelizeModule();
   await sequelize.sync();
 }