From 8a47792bdef3566db9ff44c52500cde724cd66b1 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Wed, 7 Oct 2020 11:52:03 +0200
Subject: [PATCH] Logging user id in idstats

---
 src/modules/api/api.js | 3 ++-
 src/server.js          | 5 -----
 src/utils/actions.js   | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/api/api.js b/src/modules/api/api.js
index cf1ead6..3178cce 100644
--- a/src/modules/api/api.js
+++ b/src/modules/api/api.js
@@ -724,7 +724,8 @@ function GetApp() {
         req.body.datatoadd || req.body,
         data,
         { motd, version },
-        dryRun
+        dryRun,
+        user
       )
       .then((result) => {
         res.json({
diff --git a/src/server.js b/src/server.js
index d744e96..dc1005f 100755
--- a/src/server.js
+++ b/src/server.js
@@ -171,9 +171,6 @@ Object.keys(modules).forEach(function(k, i) {
   }
 })
 
-const locLogFile = './stats/logs'
-const allLogFile = '/nlogs/log'
-
 // https://certbot.eff.org/
 const privkeyFile = '/etc/letsencrypt/live/frylabs.net/privkey.pem'
 const fullchainFile = '/etc/letsencrypt/live/frylabs.net/fullchain.pem'
@@ -255,8 +252,6 @@ function LogTimerAction() {
     '==================================================================================================================================================='
   logger.Log(line)
   logger.setNewLogfileName()
-  utils.AppendToFile(line, locLogFile)
-  utils.AppendToFile(line, allLogFile)
 }
 
 logger.Log('Node version: ' + process.version)
diff --git a/src/utils/actions.js b/src/utils/actions.js
index e26582b..5332ae8 100755
--- a/src/utils/actions.js
+++ b/src/utils/actions.js
@@ -37,7 +37,7 @@ const { addQuestion, getSubjNameWithoutYear } = require('./classes.js')
 const writeAfter = 1 // write after # of adds FIXME: set reasonable save rate
 var currWrites = 0
 
-function ProcessIncomingRequest(recievedData, qdb, infos, dryRun) {
+function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
   return new Promise((resolve, reject) => {
     logger.DebugLog('Processing incoming request', 'actions', 1)
     if (recievedData === undefined) {
@@ -153,7 +153,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun) {
           let subjRow = '\t' + data.subj
           if (data.id) {
             subjRow += ' ( CID: ' + logger.logHashed(data.id) + ')'
-            idStats.LogId(data.id, data.subj)
+            idStats.LogId(user.id, data.subj)
           }
           logger.Log(subjRow)
           if (data.version !== undefined) {