From 18947141ab7d256463ec0e6ca72d2dc1554b9ffc Mon Sep 17 00:00:00 2001 From: MrFry Date: Sat, 28 Nov 2020 12:49:14 +0100 Subject: [PATCH 1/3] minor logging / status changes --- scripts/serverStats.sh | 1 + src/server.js | 2 +- submodules/moodle-test-userscript | 2 +- submodules/qmining-page | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/serverStats.sh b/scripts/serverStats.sh index 1a7ad92..01caab0 100755 --- a/scripts/serverStats.sh +++ b/scripts/serverStats.sh @@ -111,6 +111,7 @@ function jsonStats() { -e "s,/pwRequest,${C}&${NC},g" \ -e "s,/login,${C}&${NC},g" \ -e "s,/manual,${G}&${NC},g" \ + -e "s,/todos,${G}&${NC},g" \ -e "s,/allQuestions,${G}&${NC},g" \ -e "s,/subjectBrowser,${G}&${NC},g" \ -e "s,/repos,${G}&${NC},g" \ diff --git a/src/server.js b/src/server.js index e8598bf..d1f14d0 100755 --- a/src/server.js +++ b/src/server.js @@ -132,7 +132,7 @@ const cookieSecret = uuidv4() app.use(cookieParser(cookieSecret)) app.use( reqlogger({ - loggableKeywords: ['stable.user.js'], + loggableKeywords: [''], loggableModules: ['dataeditor'], }) ) diff --git a/submodules/moodle-test-userscript b/submodules/moodle-test-userscript index f8d4bf2..dc07c90 160000 --- a/submodules/moodle-test-userscript +++ b/submodules/moodle-test-userscript @@ -1 +1 @@ -Subproject commit f8d4bf2a414d2973582c08bfa8b8b8f19389b2e9 +Subproject commit dc07c903d39003a5cc13302a9ee6e6e3e0b6ee17 diff --git a/submodules/qmining-page b/submodules/qmining-page index 12affac..de5b4b7 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit 12affac1a279b20fe57dc5a7eb44fb799b8cc6e9 +Subproject commit de5b4b72b6a85dd095db8610965cb543ec3548f8 From 18d181bd31693c5cc7a4deb4e096a01cab3ad21e Mon Sep 17 00:00:00 2001 From: MrFry Date: Sat, 28 Nov 2020 12:50:44 +0100 Subject: [PATCH 2/3] minor logging / status changes 2 --- src/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.js b/src/server.js index d1f14d0..b4020d9 100755 --- a/src/server.js +++ b/src/server.js @@ -132,7 +132,7 @@ const cookieSecret = uuidv4() app.use(cookieParser(cookieSecret)) app.use( reqlogger({ - loggableKeywords: [''], + loggableKeywords: [], loggableModules: ['dataeditor'], }) ) From 82eca473e8066d179410d5eba7ae6cd989e71d42 Mon Sep 17 00:00:00 2001 From: MrFry Date: Sun, 24 Jan 2021 11:53:46 +0100 Subject: [PATCH 3/3] Not deleting existing sessions till there are 3 of them, logging news.json, login feedback text update --- src/modules/api/api.js | 2 +- src/server.js | 2 +- src/sharedViews/login.ejs | 2 +- submodules/qmining-page | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/api/api.js b/src/modules/api/api.js index 1390b46..ed8dee3 100644 --- a/src/modules/api/api.js +++ b/src/modules/api/api.js @@ -597,7 +597,7 @@ function GetApp() { isScript: isScript ? 1 : 0, }) - if (existingSessions.length > 0) { + if (existingSessions.length > 2) { logger.Log( `Multiple ${isScript ? 'script' : 'website'} sessions ( ${ existingSessions.length diff --git a/src/server.js b/src/server.js index b4020d9..562043b 100755 --- a/src/server.js +++ b/src/server.js @@ -132,7 +132,7 @@ const cookieSecret = uuidv4() app.use(cookieParser(cookieSecret)) app.use( reqlogger({ - loggableKeywords: [], + loggableKeywords: ['news.json'], loggableModules: ['dataeditor'], }) ) diff --git a/src/sharedViews/login.ejs b/src/sharedViews/login.ejs index e8bb548..e16e3d1 100644 --- a/src/sharedViews/login.ejs +++ b/src/sharedViews/login.ejs @@ -163,7 +163,7 @@ function ShowFeedback () { const form = document.getElementById('form').style.display = "none"; const feedback = document.getElementById('feedback').style.display = "block"; - document.getElementById('text').innerText = 'Ha szeretnél választ kapni akkor kérdésed mellé írd be e-mailed, vagy kattints a lenti "IRC" linkre. Jelszót meglévő felhasználóktól kérj! E-mail esetén válasz spam-be is érkezhet!' + document.getElementById('text').innerText = 'Ha szeretnél választ kapni akkor IRC-n próbálj meg elérni (lenti link). Jelszót meglévő felhasználóktól kérj!' } function HandleResp (resp) { const button = document.getElementById('sendButton') diff --git a/submodules/qmining-page b/submodules/qmining-page index de5b4b7..0c69bf9 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit de5b4b72b6a85dd095db8610965cb543ec3548f8 +Subproject commit 0c69bf931ffd743a489a45ac24ce78e5bcb5644a