From 760c7e4fd085b46a8e92ab0e299ce2ed1617769a Mon Sep 17 00:00:00 2001 From: portree_kid Date: Mon, 6 Jul 2020 22:06:23 +0200 Subject: [PATCH] File Logger --- src/renderer/components/RunScan.vue | 6 +++--- src/renderer/components/SettingsPanel.vue | 26 +++++++++++++++++++++++ src/renderer/store/modules/Settings.js | 5 ++++- src/renderer/utils/logger.js | 18 +++++++++++----- src/renderer/utils/worker.js | 13 +++++++++++- 5 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src/renderer/components/RunScan.vue b/src/renderer/components/RunScan.vue index 0155af4..c1acb6b 100644 --- a/src/renderer/components/RunScan.vue +++ b/src/renderer/components/RunScan.vue @@ -80,7 +80,7 @@ worker.progress = 0 // var worker = new Worker(fileUrl('src/renderer/utils/worker.js')) this.worker = worker - worker.postMessage(['scanapt', this.$store.state.Settings.settings.flightgearDirectory_apt]) + worker.postMessage(['scanapt', this.$store.state.Settings.settings.flightgearDirectory_apt, this.$store.state.Settings.settings.scanLogging]) this.pollData() // the reply var store = this.$store @@ -127,7 +127,7 @@ worker.progress = 0 this.worker = worker - worker.postMessage(['scan', this.$store.state.Settings.settings.airportsDirectory]) + worker.postMessage(['scan', this.$store.state.Settings.settings.airportsDirectory, this.$store.state.Settings.settings.scanLogging]) this.pollData() // the reply var store = this.$store @@ -174,7 +174,7 @@ worker.max = this.max worker.progress = this.progress this.worker = worker - worker.postMessage(['scanai', this.$store.state.Settings.settings.flightgearDirectory_traffic]) + worker.postMessage(['scanai', this.$store.state.Settings.settings.flightgearDirectory_traffic, this.$store.state.Settings.settings.scanLogging]) this.pollData() // the reply var store = this.$store diff --git a/src/renderer/components/SettingsPanel.vue b/src/renderer/components/SettingsPanel.vue index 443ad2d..f7f7c37 100644 --- a/src/renderer/components/SettingsPanel.vue +++ b/src/renderer/components/SettingsPanel.vue @@ -82,6 +82,22 @@ + + + Scan logging : + + + + + + + @@ -184,6 +200,16 @@ }, test_directory: function () { return this.$store.state.Settings.settings.testDirectory + }, + scanLogging: { + // getter + get: function () { + return this.$store.state.Settings.settings.scanLogging === 1 + }, + // setter + set: function (newValue) { + this.$store.commit('SET_SCAN_LOGGING', newValue ? 1 : 0) + } } } } diff --git a/src/renderer/store/modules/Settings.js b/src/renderer/store/modules/Settings.js index c0d67ee..3109985 100644 --- a/src/renderer/store/modules/Settings.js +++ b/src/renderer/store/modules/Settings.js @@ -38,7 +38,10 @@ const mutations = { }, 'SET_PHI_URL' (state, phi_url) { state.settings.phi_url = phi_url - }, + }, + 'SET_SCAN_LOGGING' (state, scanLogging) { + state.settings.scanLogging = scanLogging + }, 'ADD_WIP' (state, airport) { const item = state.wip.find((e) => e.icao === airport.icao) airport.time = Date.now() diff --git a/src/renderer/utils/logger.js b/src/renderer/utils/logger.js index 783c705..200a07a 100644 --- a/src/renderer/utils/logger.js +++ b/src/renderer/utils/logger.js @@ -1,4 +1,4 @@ -var util = require("util") +var util = require("util"); const d = new Date(); @@ -10,12 +10,20 @@ const fName = 'scan_' + d.getFullYear() + d.getSeconds() + d.getMilliseconds() + '.log'; -var logStream = require('fs').createWriteStream( fName, {autoClose: true}); +var logStream = null; + +var loggerInit = function (logging) { + if (logging) { + logStream = require('fs').createWriteStream( fName, {autoClose: true}); + } +} var logger = function (level, msg, o) { var d = new Date(); - //logStream.write(d.toUTCString() + '|' + level + ' | ' + msg + '\r\n'); - if (o != undefined) { - //logStream.write( util.inspect(o,{depth: 2}) + '\r\n'); + if(logStream!==null) { + logStream.write(d.toUTCString() + '|' + level + ' | ' + msg + '\r\n'); + } + if (o != undefined && logStream!==null) { + logStream.write( util.inspect(o,{depth: 2}) + '\r\n'); } } \ No newline at end of file diff --git a/src/renderer/utils/worker.js b/src/renderer/utils/worker.js index 1b0d7ae..e8bf8ff 100644 --- a/src/renderer/utils/worker.js +++ b/src/renderer/utils/worker.js @@ -19,9 +19,10 @@ function errorReceiver(event) { onmessage = function (event) { postMessage('scanStarted'); - logger('info', 'Scan Started'); console.log(event.data); if (event.data[0] === 'scan') { + loggerInit(event.data[2]); + logger('info', 'Scan Groundnet Started'); scanGroundnet(event.data[1]).then(result => { console.log("DONE Scanning"); postMessage('DONE'); @@ -30,9 +31,13 @@ onmessage = function (event) { ).catch(result => { console.log('Crashed'); console.log(result); + logger('error', 'crashed'); + logger('error', result); postMessage('DONE'); }); } else if (event.data[0] === 'scanai') { + loggerInit(event.data[2]); + logger('info', 'Scan AI Started'); scanai(event.data[1]).then(result => { console.log("DONE Scanning"); postMessage('DONE'); @@ -41,10 +46,14 @@ onmessage = function (event) { ).catch(result => { console.log('Crashed'); console.log(result); + logger('error', 'crashed'); + logger('error', result); postMessage('DONE'); }); } else if (event.data[0] === 'scanapt') { + loggerInit(event.data[2]); + logger('info', 'Scan APT Started'); scanAPT(event.data[1]).then(result => { console.log("DONE Scanning"); postMessage('DONE'); @@ -53,6 +62,8 @@ onmessage = function (event) { ).catch(result => { console.log('Crashed'); console.log(result); + logger('error', 'crashed'); + logger('error', result); postMessage('DONE'); });