freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix logging: Config options for debugging and profiling had no effect.

Browse source
This commit is contained in:
baldo 2022-07-28 15:07:35 +02:00
parent 13e4895b81
commit 111fac6e47
3 changed files with 84 additions and 12 deletions
server
logger.ts

22
server/logger.ts
View file

@ -1,4 +1,4 @@
import {isString, Logger, LogLevel, TaggedLogger} from './types';
import {isString, Logger, LoggingConfig, LogLevel, TaggedLogger} from './types';
import moment from 'moment';
export type LoggingFunction = (...args: any[]) => void;
@ -13,23 +13,25 @@ const noopTaggedLogger: TaggedLogger = {
};
export interface ActivatableLogger extends Logger {
init(enabled: boolean, loggingFunction?: LoggingFunction): void;
init(config: LoggingConfig, loggingFunction?: LoggingFunction): void;
}
/**
* TODO: Check if LoggingConfig.debug and LoggingConfig.profile are handled.
*/
export class ActivatableLoggerImpl implements ActivatableLogger {
private enabled: boolean = false;
private config: LoggingConfig = new LoggingConfig(false, false, false);
private loggingFunction: LoggingFunction = console.info;
init(enabled: boolean, loggingFunction?: LoggingFunction): void {
this.enabled = enabled;
init(config: LoggingConfig, loggingFunction?: LoggingFunction): void {
this.config = config;
this.loggingFunction = loggingFunction || console.info;
}
tag(...tags: string[]): TaggedLogger {
if (this.enabled) {
if (this.config.enabled) {
const debug = this.config.debug;
const profile = this.config.profile;
const loggingFunction = this.loggingFunction;
return {
log(level: LogLevel, ...args: any[]): void {
@ -54,7 +56,9 @@ export class ActivatableLoggerImpl implements ActivatableLogger {
loggingFunction(logStr, ...args);
},
debug(...args: any[]): void {
this.log('debug', ...args);
if (debug) {
this.log('debug', ...args);
}
},
info(...args: any[]): void {
this.log('info', ...args);
@ -66,7 +70,9 @@ export class ActivatableLoggerImpl implements ActivatableLogger {
this.log('error', ...args);
},
profile(...args: any[]): void {
this.log('profile', ...args);
if (profile) {
this.log('profile', ...args);
}
},
}
} else {