From 68c6b2b636ed0004c1e039274ac83a1ea3814854 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Wed, 9 Oct 2019 17:18:07 +0200
Subject: [PATCH] Added merger.sh, and minor logging improvement

---
 utils/logger.js |  3 ++-
 utils/merge.sh  | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 utils/merge.sh

diff --git a/utils/logger.js b/utils/logger.js
index 44d0994..abee18a 100644
--- a/utils/logger.js
+++ b/utils/logger.js
@@ -74,8 +74,9 @@ function LogReq (req, toFile, sc) {
 
     if (sc !== undefined && sc === 404) { logEntry += dl + sc }
 
+    logEntry += C()
     if (!toFile) {
-      Log(logEntry + C())
+      Log(logEntry)
     } else {
       let defLogs = GetDateString() + dl + logEntry
 
diff --git a/utils/merge.sh b/utils/merge.sh
new file mode 100755
index 0000000..b3289ae
--- /dev/null
+++ b/utils/merge.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+p="/home/qminer/nodeServ"
+
+cp -v $p/public/data.json /tmp/data.json
+node $p/utils/merger.js /tmp/data.json
+
+mv -v $p/public/data.json "$p/public/backs/data.json $(date)"
+mv -v $p/utils/newData $p/public/data.json
+
+echo Done