From 1b66ae83a5db2872311dde44bba5faf1b27623b7 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 10 Dec 2017 11:24:07 +0100 Subject: [PATCH] use existing method for war end date; extend backup output --- api/server.js | 1 - api/tools/log-parse-tool.js | 2 +- backup/backup.sh | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/server.js b/api/server.js index 5c209ee..9fda98e 100644 --- a/api/server.js +++ b/api/server.js @@ -129,7 +129,6 @@ if (process.env.NODE_ENV !== config.test.env) { useMongoClient: true }); mongoosePromise.then((db) => { - process.env.TZ = 'Europe/Berlin'; app.listen(config.test.port); console.log('Listening on port ' + config.test.port); }) diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js index ce4d51d..f9271e9 100644 --- a/api/tools/log-parse-tool.js +++ b/api/tools/log-parse-tool.js @@ -62,7 +62,7 @@ const parseWarLog = (lineArray, war) => { if (line.includes('Endbudget')) { stats.war['endBudgetBlufor'] = transformMoneyString(budg[11]); stats.war['endBudgetOpfor'] = transformMoneyString(budg[14]); - stats.war.endDate = new Date(budg[0].substr(0, budg[0].length - 1).split('/').join('-') + 'T0' + budg[5]); + stats.war.endDate = getFullTimeDate(war.date, budg[5]); } else if (line.includes('Startbudget')) { stats.war['budgetBlufor'] = transformMoneyString(budg[11]); stats.war['budgetOpfor'] = transformMoneyString(budg[14]); diff --git a/backup/backup.sh b/backup/backup.sh index f3724ad..eb522b1 100755 --- a/backup/backup.sh +++ b/backup/backup.sh @@ -23,6 +23,7 @@ do # provide date for restore process, if data import is needed if [ -z "$1" ] then + echo "table ${i}" mongoexport --db cc --collection $i --out ${DATE}/collections/${i}.json; else mongoimport --db cc --collection $i --drop --file ${1}/collections/${i}.json