tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add timeout to logger

Browse Source
This commit is contained in:
Tamius Han 2020-01-06 21:37:40 +01:00
parent 936cb78b26
commit 73872d4188
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ext/lib/Logger.js
View File

@ -10,6 +10,7 @@ class Logger {
this.history = []; this.history = [];
this.startTime = performance.now(); this.startTime = performance.now();
this.temp_disable = false; this.temp_disable = false;
this.stopTime = confTimeout ? performance.now() + (conf.timeout * 1000) : undefined;
} }
initLogger() { initLogger() {
@ -37,6 +38,7 @@ class Logger {
clear() { clear() {
this.log = []; this.log = [];
this.startTime = performance.now(); this.startTime = performance.now();
this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined;
} }
setConf(conf) { setConf(conf) {
@ -94,15 +96,21 @@ class Logger {
} }
} }
getLogFileString() { // getLogFileString() {
let logfileStr = ''; // let logfileStr = '';
let logTs = ''; // number of seconds since extension started on a given page¸ // let logTs = ''; // number of seconds since extension started on a given page¸
for (let i = 0; i < this.history.length; i++) { // for (let i = 0; i < this.history.length; i++) {
logTs = ((this.history[i].ts - Math.floor(this.performance.now)) / 3).toFixed(3); // logTs = ((this.history[i].ts - Math.floor(this.performance.now)) / 3).toFixed(3);
logfileStr = `${logfileStr}[@${logTs}] -- ${this.history[i].message}\n` // logfileStr = `${logfileStr}[@${logTs}] -- ${this.history[i].message}\n`
} // }
return logfileStr; // return logfileStr;
// }
getFileLogJSONString() {
return {
site: window && window.location,
log: JSON.toString(this.history),
}
} }
pause() { pause() {
@ -120,6 +128,9 @@ class Logger {
if (!this.conf.fileOptions.enabled || this.temp_disable) { if (!this.conf.fileOptions.enabled || this.temp_disable) {
return false; return false;
} }
if (performance.now() > this.stopTime) {
return false;
}
if (Array.isArray(component) && component.length ) { if (Array.isArray(component) && component.length ) {
for (const c of component) { for (const c of component) {
if (this.conf.fileOptions[c]) { if (this.conf.fileOptions[c]) {
@ -134,6 +145,9 @@ class Logger {
if (!this.conf.consoleOptions.enabled || this.temp_disable) { if (!this.conf.consoleOptions.enabled || this.temp_disable) {
return false; return false;
} }
if (performance.now() > this.stopTime) {
return false;
}
if (Array.isArray(component) && component.length) { if (Array.isArray(component) && component.length) {
for (const c of component) { for (const c of component) {
if (this.conf.consoleOptions[c]) { if (this.conf.consoleOptions[c]) {
@ -151,6 +165,7 @@ class Logger {
if (!this.conf) { if (!this.conf) {
return; return;
} }
const error = new Error();
if (this.conf.logToFile) { if (this.conf.logToFile) {
if (this.canLogFile(component)) { if (this.canLogFile(component)) {
let ts = performance.now(); let ts = performance.now();
@ -161,12 +176,13 @@ class Logger {
this.history.push({ this.history.push({
ts: ts, ts: ts,
message: JSON.stringify(message), message: JSON.stringify(message),
stack: error.stack,
}) })
} }
} }
if (this.conf.logToConsole) { if (this.conf.logToConsole) {
if (this.canLogConsole(component)) { if (this.canLogConsole(component)) {
console.log(...message); console.log(...message, error.stack);
} }
} }
} }