Skip to content

Commit d003c0e

Browse files
author
Hamid Tavakoli
committed
Added more logging
1 parent 9b645b5 commit d003c0e

File tree

6 files changed

+27
-18
lines changed

6 files changed

+27
-18
lines changed

connect/connectEmailServer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ emailServer
4646
emailServer.start()
4747
})
4848
.catch((e) => {
49-
console.log('Error occurred in starting email server:', e);
50-
console.log(e)
49+
logger.error('Error occurred in starting email server:', e);
50+
process.exit(1);
5151
}); // eslint-disable-line no-console
5252

5353
// if no need to init database, then directly start the server:

connect/service.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,13 @@ const sendEmail = async (templateId, message) => { // send email
5151
};
5252
}
5353
logger.info(`Sending email with templateId: ${templateId} and message: ${JSON.stringify(msg)}`);
54-
return sgMail.send(msg)
54+
try {
55+
const result = await sgMail.send(msg)
56+
return result
57+
} catch (err) {
58+
logger.error(`Error occurred in sendgrid api calling: ${err}`);
59+
throw err
60+
}
5561
}
5662
module.exports = {
5763
sendEmail,

index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const schedule = require('node-schedule');
99
const helper = require('./src/common/helper');
1010
const logger = require('./src/common/logger');
1111
const errors = require('./src/common/errors');
12+
const models = require('./src/models');
1213
const { initServer, retryEmail } = require('./src/init');
1314

1415
config.TEMPLATE_MAP = JSON.parse(config.TEMPLATE_MAP);
@@ -154,6 +155,9 @@ function start() {
154155
app.listen(app.get('port'), () => {
155156
logger.info(`Express server listening on port ${app.get('port')}`);
156157
});
158+
}).catch((err) => {
159+
logger.error(err);
160+
process.exit(1);
157161
})
158162
}
159163

@@ -164,7 +168,6 @@ function start() {
164168
async function initDatabase() {
165169
// load models only after config is set
166170
logger.info('Initializing database...');
167-
const models = require('./src/models');
168171
await models.init(true);
169172
}
170173

package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
"cors": "^2.8.5",
2929
"dotenv": "^16.0.2",
3030
"express": "^4.18.1",
31-
"joi": "^17.6.0",
31+
"joi": "^17.6.1",
3232
"jwks-rsa": "^2.1.4",
3333
"kafkajs": "^2.2.0",
3434
"lodash": "^4.17.21",
3535
"node-schedule": "^2.1.0",
3636
"pg": "^8.8.0",
37-
"sequelize": "^6.21.4",
37+
"sequelize": "^6.23.1",
3838
"superagent": "^8.0.0",
3939
"tc-core-library-js": "^2.4.1",
4040
"winston": "^3.8.1"
4141
}
42-
}
42+
}

src/common/errors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function _createError(name, statusCode) {
2525
this.cause = cause;
2626
this.httpStatus = statusCode;
2727
}
28-
28+
//TODO: upgrade to ES6
2929
util.inherits(ErrorCtor, Error);
3030
ErrorCtor.prototype.name = name;
3131
return ErrorCtor;

0 commit comments

Comments
 (0)