merge

utils/actions.js

@@ -97,6 +97,7 @@ function ProcessIncomingRequest (data) {
     logger.Log('\t' + d.subj)
     var msg = 'All / new count: ' + allQuestions.length + ' / ' + questions.length
     if (d.version !== undefined) { msg += '. Version: ' + d.version }
+
     var color = logger.GetColor('green')
 
     try {

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
 

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