From f03c7581214e13a34a1ec475c4825de8a46162b7 Mon Sep 17 00:00:00 2001
From: Adhidarma Hadiwinoto <adhisimon@gmail.com>
Date: Mon, 14 Jun 2021 17:16:33 +0700
Subject: [PATCH] Fix core-callback sender postpaid
---
lib/core-callback/index.js | 4 +++-
lib/partner-listener/dumper/index.js | 2 +-
lib/utils/mkdir-if-not-exists.js | 15 ++++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/lib/core-callback/index.js b/lib/core-callback/index.js
index e588921..93ce658 100644
--- a/lib/core-callback/index.js
+++ b/lib/core-callback/index.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)
diff --git a/lib/partner-listener/dumper/index.js b/lib/partner-listener/dumper/index.js
index 85085a0..305025e 100644
--- a/lib/partner-listener/dumper/index.js
+++ b/lib/partner-listener/dumper/index.js
@@ -48,7 +48,7 @@ ${typeof responseBody === 'string' ? 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) {
diff --git a/lib/utils/mkdir-if-not-exists.js b/lib/utils/mkdir-if-not-exists.js
index 60a3c44..32b239e 100644
--- a/lib/utils/mkdir-if-not-exists.js
+++ b/lib/utils/mkdir-if-not-exists.js
@@ -3,27 +3,28 @@ const MODULE_NAME = 'MKDIR-IF-NOT-EXISTS';
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);
}
};
--
1.9.0