Fix core-callback sender postpaid

Adhidarma Hadiwinoto
1 parent ab9902ea02
Showing 3 changed files with 12 additions and 9 deletions Side-by-side Diff
lib/core-callback/index.js
lib/partner-listener/dumper/index.js
lib/utils/mkdir-if-not-exists.js
@@ -26,7 +26,9 @@ app.use(dumperReq);
 app.use((req, res) => {
     matrix.core.received += 1;
     res.end('OK');
-    sender(req.query, res.locals.xid);
+
+    const data = req.method === 'GET' ? req.query : req.body;
+    sender(data, res.locals.xid);
 });
  
 const port = (config.listener && config.listener.core && config.listener.core.port)
@@ -48,7 +48,7 @@ ${typeof responseBody === &#39;string&#39; ? responseBody : JSON.stringify(responseBody,
     );
  
     try {
-        await mkdirIfNotExists(xid, path.basename(dumpFileName));
+        await mkdirIfNotExists(xid, path.dirname(dumpFileName), MODULE_NAME);
         await fsPromise.writeFile(lastDumpFileName, data);
         await fsPromise.writeFile(dumpFileName, data);
     } catch (e) {
@@ -3,27 +3,28 @@ const MODULE_NAME = &#39;MKDIR-IF-NOT-EXISTS&#39;;
 const fsPromise = require('fs').promises;
 const logger = require('komodo-sdk/logger');
  
-const mkdir = async (xid, dirname) => {
+const mkdir = async (xid, dirname, callerName) => {
     try {
+        logger.verbose(`${MODULE_NAME} 6B08D52D: Creating directory`, {
+            xid, dirname, callerName,
+        });
+
         await fsPromise.mkdir(dirname, { recursive: true });
     } catch (e) {
         logger.warn(`${MODULE_NAME} 857718E9: Exception on creating directory`, {
             xid,
             dirname,
+            callerName,
             eCode: e.code,
             eMessage: e.message,
         });
     }
 };
  
-module.exports = async (xid, dirname) => {
+module.exports = async (xid, dirname, callerName) => {
     try {
         await fsPromise.stat(dirname);
     } catch (e) {
-        logger.verbose(`${MODULE_NAME} 6B08D52D: Creating directory`, {
-            xid, dirname,
-        });
-
-        await mkdir(xid, dirname);
+        await mkdir(xid, dirname, callerName);
     }
 };
...	...	@@ -26,7 +26,9 @@ app.use(dumperReq);
26	26	app.use((req, res) => {
27	27	matrix.core.received += 1;
28	28	res.end('OK');
29		- sender(req.query, res.locals.xid);
	29	+
	30	+ const data = req.method === 'GET' ? req.query : req.body;
	31	+ sender(data, res.locals.xid);
30	32	});
31	33
32	34	const port = (config.listener && config.listener.core && config.listener.core.port)
...	...	@@ -48,7 +48,7 @@ ${typeof responseBody === 'string' ? responseBody : JSON.stringify(responseBody,
48	48	);
49	49
50	50	try {
51		- await mkdirIfNotExists(xid, path.basename(dumpFileName));
	51	+ await mkdirIfNotExists(xid, path.dirname(dumpFileName), MODULE_NAME);
52	52	await fsPromise.writeFile(lastDumpFileName, data);
53	53	await fsPromise.writeFile(dumpFileName, data);
54	54	} catch (e) {
...	...	@@ -3,27 +3,28 @@ const MODULE_NAME = 'MKDIR-IF-NOT-EXISTS';
3	3	const fsPromise = require('fs').promises;
4	4	const logger = require('komodo-sdk/logger');
5	5
6		-const mkdir = async (xid, dirname) => {
	6	+const mkdir = async (xid, dirname, callerName) => {
7	7	try {
	8	+ logger.verbose(`${MODULE_NAME} 6B08D52D: Creating directory`, {
	9	+ xid, dirname, callerName,
	10	+ });
	11	+
8	12	await fsPromise.mkdir(dirname, { recursive: true });
9	13	} catch (e) {
10	14	logger.warn(`${MODULE_NAME} 857718E9: Exception on creating directory`, {
11	15	xid,
12	16	dirname,
	17	+ callerName,
13	18	eCode: e.code,
14	19	eMessage: e.message,
15	20	});
16	21	}
17	22	};
18	23
19		-module.exports = async (xid, dirname) => {
	24	+module.exports = async (xid, dirname, callerName) => {
20	25	try {
21	26	await fsPromise.stat(dirname);
22	27	} catch (e) {
23		- logger.verbose(`${MODULE_NAME} 6B08D52D: Creating directory`, {
24		- xid, dirname,
25		- });
26		-
27		- await mkdir(xid, dirname);
	28	+ await mkdir(xid, dirname, callerName);
28	29	}
29	30	};