diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts index 62fac4c..2214d1a 100644 --- a/src/modules/api/api.ts +++ b/src/modules/api/api.ts @@ -42,7 +42,11 @@ import { } from '../../utils/actions' import dbtools from '../../utils/dbtools' import auth from '../../middlewares/auth.middleware' -import { dataToString, getSubjNameWithoutYear } from '../../utils/classes' +import { + dataToString, + getSubjNameWithoutYear, + createQuestion, +} from '../../utils/classes' import { initWorkerPool, doALongTask, @@ -1625,7 +1629,7 @@ function GetApp(): ModuleType { logger.Log( `User #${user.id} deleted '${file}' from subject '${subj}'`, - logger.GetColor('cyanbg') + logger.GetColor('cyan') ) res.json({ res: 'ok', @@ -1710,7 +1714,7 @@ function GetApp(): ModuleType { logger.Log( `User #${user.id} deleted a question from '${subjName}'`, - logger.GetColor('cyanbg') + logger.GetColor('cyan') ) utils.AppendToFile( `${date}: User ${user.id} deleted a question from '${subjName}' (index: ${index})`, @@ -1770,7 +1774,7 @@ function GetApp(): ModuleType { Questions: subj.Questions.map((question, i) => { if (index === i) { oldVal = question - return newVal + return createQuestion(newVal) } else { return question } @@ -1781,7 +1785,7 @@ function GetApp(): ModuleType { logger.Log( `User #${user.id} edited a question in '${subjName}'`, - logger.GetColor('cyanbg') + logger.GetColor('cyan') ) utils.AppendToFile( `${date}: User ${user.id} edited a question in '${subjName}' (index: ${index})`, @@ -1859,7 +1863,7 @@ function GetApp(): ModuleType { oldVal: question, newVal: changedTo.value, }) - return changedTo.value + return createQuestion(changedTo.value) } else { return question } @@ -1890,7 +1894,7 @@ function GetApp(): ModuleType { logger.Log( `User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`, - logger.GetColor('cyanbg') + logger.GetColor('cyan') ) utils.AppendToFile( `${date} User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`, diff --git a/src/server.ts b/src/server.ts index 3ded398..12ef050 100755 --- a/src/server.ts +++ b/src/server.ts @@ -44,6 +44,9 @@ const extraModulesFile = '.src/extraModules/extraModules.json' const statExcludeFile = './data/statExclude.json' const modulesFile = './src/modules.json' const usersDBPath = './data/dbs/users.db' +const logFile = logger.logDir + logger.logFileName +const vlogFile = logger.vlogDir + logger.logFileName + idStats.Load() logger.Load() @@ -78,6 +81,8 @@ let modules: Modules = utils.ReadJSON(modulesFile) const debugLevel = parseInt(process.env.NS_LOGLEVEL) || 0 logger.Log('Loglevel is: ' + debugLevel) +logger.Log(`Log path: ${logFile}`) +logger.Log(`vLog path: ${vlogFile}`) try { if (utils.FileExists(extraModulesFile)) { @@ -275,9 +280,6 @@ function rotateLog() { ':' + ('0' + date.getSeconds()).slice(-2) - const logFile = logger.logDir + logger.logFileName - const vlogFile = logger.vlogDir + logger.logFileName - if (utils.FileExists(logFile)) { utils.CopyFile(logFile, logger.logDir + fname) } diff --git a/submodules/qmining-page b/submodules/qmining-page index e311b88..47a2227 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit e311b88508f0c77d6b97a4273e57aa5d656a1a64 +Subproject commit 47a2227f87f4f2ca726c16328006de174fa04aac