More log on received handler

Adhidarma Hadiwinoto
1 parent 3b649ecc2b
Showing 1 changed file with 16 additions and 4 deletions Side-by-side Diff
lib/smstools-handler/received.js
@@ -10,19 +10,20 @@ messagingClient.setTransport(transport);
  
 const mailparser = require('../mailparser-wrapper');
  
+const eventType = 'RECEIVED';
  
 module.exports = async (msgFilename) => {
     const msg = await fs.promises.readFile(msgFilename);
  
     if (!msg) {
-        logger.warn('Can not read message file', { msgFile: msgFilename });
+        logger.warn('Can not read message file', { eventType, msgFile: msgFilename });
         return;
     }
  
     const parsedMsg = await mailparser(msg);
  
     if (!parsedMsg || !parsedMsg.headers) {
-        logger.warn('Invalid message');
+        logger.warn('Invalid message', { eventType, msgFile: msgFilename, msgFileContent: msg });
         return;
     }
  
@@ -34,7 +35,12 @@ module.exports = async (msgFilename) =&gt; {
     const sent = sentRaw && moment(sentRaw, 'YY-MM-DD HH:mm:ss');
  
     logger.info('Message parsed', {
-        from, imsi, text, sent,
+        eventType,
+        msgFile: msgFilename,
+        from,
+        imsi,
+        text,
+        sent,
     });
  
     if (!from || !imsi || !text) {
@@ -45,7 +51,13 @@ module.exports = async (msgFilename) =&gt; {
         const messageAgeMs = new Date() - sent;
         if (messageAgeMs > 5 * 60 * 1000) {
             logger.info('Ignore expired message', {
-                imsi, from, text, sent, messageAgeMs,
+                eventType,
+                msgFile: msgFilename,
+                imsi,
+                from,
+                text,
+                sent,
+                messageAgeMs,
             });
             return;
         }
...	...	@@ -10,19 +10,20 @@ messagingClient.setTransport(transport);
10	10
11	11	const mailparser = require('../mailparser-wrapper');
12	12
	13	+const eventType = 'RECEIVED';
13	14
14	15	module.exports = async (msgFilename) => {
15	16	const msg = await fs.promises.readFile(msgFilename);
16	17
17	18	if (!msg) {
18		- logger.warn('Can not read message file', { msgFile: msgFilename });
	19	+ logger.warn('Can not read message file', { eventType, msgFile: msgFilename });
19	20	return;
20	21	}
21	22
22	23	const parsedMsg = await mailparser(msg);
23	24
24	25	if (!parsedMsg \|\| !parsedMsg.headers) {
25		- logger.warn('Invalid message');
	26	+ logger.warn('Invalid message', { eventType, msgFile: msgFilename, msgFileContent: msg });
26	27	return;
27	28	}
28	29
...	...	@@ -34,7 +35,12 @@ module.exports = async (msgFilename) => {
34	35	const sent = sentRaw && moment(sentRaw, 'YY-MM-DD HH:mm:ss');
35	36
36	37	logger.info('Message parsed', {
37		- from, imsi, text, sent,
	38	+ eventType,
	39	+ msgFile: msgFilename,
	40	+ from,
	41	+ imsi,
	42	+ text,
	43	+ sent,
38	44	});
39	45
40	46	if (!from \|\| !imsi \|\| !text) {
...	...	@@ -45,7 +51,13 @@ module.exports = async (msgFilename) => {
45	51	const messageAgeMs = new Date() - sent;
46	52	if (messageAgeMs > 5 * 60 * 1000) {
47	53	logger.info('Ignore expired message', {
48		- imsi, from, text, sent, messageAgeMs,
	54	+ eventType,
	55	+ msgFile: msgFilename,
	56	+ imsi,
	57	+ from,
	58	+ text,
	59	+ sent,
	60	+ messageAgeMs,
49	61	});
50	62	return;
51	63	}