albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Logging user id in idstats

Browse source
This commit is contained in:
mrfry 2020-10-07 11:52:03 +02:00
parent 814d38dc8d
commit 8a47792bde
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/api/api.js
View file

@ -724,7 +724,8 @@ function GetApp() {
req.body.datatoadd || req.body, req.body.datatoadd || req.body,
data, data,
{ motd, version }, { motd, version },
dryRun dryRun,
user
) )
.then((result) => { .then((result) => {
res.json({ res.json({

5
src/server.js
View file

@ -171,9 +171,6 @@ Object.keys(modules).forEach(function(k, i) {
} }
}) })
const locLogFile = './stats/logs'
const allLogFile = '/nlogs/log'
// https://certbot.eff.org/ // https://certbot.eff.org/
const privkeyFile = '/etc/letsencrypt/live/frylabs.net/privkey.pem' const privkeyFile = '/etc/letsencrypt/live/frylabs.net/privkey.pem'
const fullchainFile = '/etc/letsencrypt/live/frylabs.net/fullchain.pem' const fullchainFile = '/etc/letsencrypt/live/frylabs.net/fullchain.pem'
@ -255,8 +252,6 @@ function LogTimerAction() {
'===================================================================================================================================================' '==================================================================================================================================================='
logger.Log(line) logger.Log(line)
logger.setNewLogfileName() logger.setNewLogfileName()
utils.AppendToFile(line, locLogFile)
utils.AppendToFile(line, allLogFile)
} }
logger.Log('Node version: ' + process.version) logger.Log('Node version: ' + process.version)

4
src/utils/actions.js
View file

@ -37,7 +37,7 @@ const { addQuestion, getSubjNameWithoutYear } = require('./classes.js')
const writeAfter = 1 // write after # of adds FIXME: set reasonable save rate const writeAfter = 1 // write after # of adds FIXME: set reasonable save rate
var currWrites = 0 var currWrites = 0
function ProcessIncomingRequest(recievedData, qdb, infos, dryRun) { function ProcessIncomingRequest(recievedData, qdb, infos, dryRun, user) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logger.DebugLog('Processing incoming request', 'actions', 1) logger.DebugLog('Processing incoming request', 'actions', 1)
if (recievedData === undefined) { if (recievedData === undefined) {
@ -153,7 +153,7 @@ function ProcessIncomingRequest(recievedData, qdb, infos, dryRun) {
let subjRow = '\t' + data.subj let subjRow = '\t' + data.subj
if (data.id) { if (data.id) {
subjRow += ' ( CID: ' + logger.logHashed(data.id) + ')' subjRow += ' ( CID: ' + logger.logHashed(data.id) + ')'
idStats.LogId(data.id, data.subj) idStats.LogId(user.id, data.subj)
} }
logger.Log(subjRow) logger.Log(subjRow)
if (data.version !== undefined) { if (data.version !== undefined) {