From 6ce52d00d9b9cb53aa8704c7c88a574d3636110d Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Sat, 25 Apr 2020 08:45:20 +0200
Subject: [PATCH] adding hostname to stats, changed data backup directory

---
 middlewares/reqlogger.middleware.js    | 2 +-
 modules/api/api.js                     | 2 +-
 modules/dataEditor/qmining-data-editor | 2 +-
 qminingPublic/moodle-test-userscript   | 2 +-
 utils/logger.js                        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/middlewares/reqlogger.middleware.js b/middlewares/reqlogger.middleware.js
index 48ee698..00672c4 100644
--- a/middlewares/reqlogger.middleware.js
+++ b/middlewares/reqlogger.middleware.js
@@ -32,7 +32,7 @@ module.exports = function (options) {
 
       logger.LogReq(req, true, res.statusCode)
       if (toLog) { logger.LogReq(req) }
-      if (res.statusCode !== 404) { logger.LogStat(req.url, ip) }
+      if (res.statusCode !== 404) { logger.LogStat(req.url, ip, hostname) }
     })
     next()
   }
diff --git a/modules/api/api.js b/modules/api/api.js
index 2384bff..0835d7d 100644
--- a/modules/api/api.js
+++ b/modules/api/api.js
@@ -541,7 +541,7 @@ function GetApp () {
       utils.AppendToFile(utils.GetDateString() + '\n' + JSON.stringify(user) + '\n' + JSON.stringify(editedQuestions) + '\n\n', dataEditsLog)
 
       // making backup
-      utils.CopyFile('./' + dataFile, `./public/backs/data_before_${user.name}_${utils.GetDateString().replace(/ /g, '_')}`)
+      utils.CopyFile('./' + dataFile, `./qminingPublic/backs/data_before_${user.name}_${utils.GetDateString().replace(/ /g, '_')}`) // TODO: rewrite to dinamyc public!!!
       logger.Log('Backup made')
       // writing data
       utils.WriteFile(JSON.stringify(newData), dataFile)
diff --git a/modules/dataEditor/qmining-data-editor b/modules/dataEditor/qmining-data-editor
index 25b9f72..6bc51fb 160000
--- a/modules/dataEditor/qmining-data-editor
+++ b/modules/dataEditor/qmining-data-editor
@@ -1 +1 @@
-Subproject commit 25b9f72093c490a11580320b152f8eef21d63da2
+Subproject commit 6bc51fb3878564012ce7af1a75b7fa049ab5f3c5
diff --git a/qminingPublic/moodle-test-userscript b/qminingPublic/moodle-test-userscript
index 2c815c8..f8d4bf2 160000
--- a/qminingPublic/moodle-test-userscript
+++ b/qminingPublic/moodle-test-userscript
@@ -1 +1 @@
-Subproject commit 2c815c8d20b6c25a4214d6118760d993f2287f36
+Subproject commit f8d4bf2a414d2973582c08bfa8b8b8f19389b2e9
diff --git a/utils/logger.js b/utils/logger.js
index 5c4aea3..ce13a49 100755
--- a/utils/logger.js
+++ b/utils/logger.js
@@ -191,7 +191,7 @@ function Load () {
   setNoLogReadInterval()
 }
 
-function LogStat (url, ip) {
+function LogStat (url, ip, hostname) {
   let nolog = noLogips.some((x) => {
     return x.includes(ip)
   })
@@ -199,7 +199,7 @@ function LogStat (url, ip) {
     return
   }
 
-  url = url.split('?')[0]
+  url = hostname + url.split('?')[0]
   Inc(url)
   AddVisitStat(url)
   Save()