Skip to content

Commit 84fc571

Browse files
author
craigparra
committed
1.1.7 / 2021-07-30
================== * Fix MultiLogger, node 10x compat - @craigparra
1 parent ead968f commit 84fc571

File tree

6 files changed

+384
-13
lines changed

6 files changed

+384
-13
lines changed

History.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
1.1.6 / 2021-07-30
1+
1.1.7 / 2021-07-30
2+
==================
3+
4+
* Fix multilogger, node 10x compat - @craigparra
5+
6+
7+
1.1.6 / 2021-07-30
28
==================
39

410
* README.md remove resources section - @craigparra

LoggerFactory.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,25 @@ const PlainTextFormatter = require('./PlainTextFormatter');
77
module.exports = class LoggerFactory {
88
static loggerCategoryCache = new LoggerCategoryCache();
99

10+
static getGlobalRef() {
11+
let $globalref = null;
12+
if (LoggerFactory.detectBrowser()) {
13+
$globalref = window;
14+
} else {
15+
$globalref = global;
16+
}
17+
return $globalref;
18+
}
19+
20+
static getGlobalRoot(key) {
21+
const $globalref = LoggerFactory.getGlobalRef();
22+
let $key = ($globalref && $globalref.boot);
23+
$key = $key && $key.contexts;
24+
$key = $key && $key.root;
25+
$key = $key && $key[`${key}`];
26+
return $key;
27+
}
28+
1029
static detectBrowser() {
1130
const browser = !(typeof window === 'undefined');
1231
return browser;
@@ -18,15 +37,12 @@ module.exports = class LoggerFactory {
1837
// eslint-disable-next-line no-undef
1938
$config = config;
2039
}
21-
if (global?.boot?.contexts?.root?.config) {
22-
$config = global.boot.contexts.root.config;
40+
if (LoggerFactory.getGlobalRoot('config')) {
41+
$config = LoggerFactory.getGlobalRoot('config');
2342
}
2443
if (LoggerFactory.detectBrowser() && window?.config) {
2544
$config = window.config;
2645
}
27-
if (LoggerFactory.detectBrowser() && window?.boot?.contexts?.root?.config) {
28-
$config = window.boot.contexts.root.config;
29-
}
3046
$config = configArg || $config;
3147
if ($config) {
3248
return $config;

MultiLogger.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ const Logger = require('./Logger');
22
const LoggerLevel = require('./LoggerLevel');
33

44
module.exports = class MultiLogger extends Logger {
5-
constructor(loggers, category, level, meta, levels) {
6-
super(category, level, levels);
5+
constructor(loggers, category, level, levels, meta) {
6+
super(category, level, levels, meta);
77
this.loggers = loggers || [];
8+
this.meta = meta || {};
89

9-
MultiLogger.prototype.setLevel = Logger.prototype.setLevel;
1010
MultiLogger.prototype.isLevelEnabled = Logger.prototype.isLevelEnabled;
1111
MultiLogger.prototype.isDebugEnabled = Logger.prototype.isDebugEnabled;
1212
MultiLogger.prototype.isVerboseEnabled = Logger.prototype.isVerboseEnabled;
@@ -16,10 +16,17 @@ module.exports = class MultiLogger extends Logger {
1616
MultiLogger.prototype.isFatalEnabled = Logger.prototype.isFatalEnabled;
1717
}
1818

19+
setLevel(level) {
20+
for (let i = 0; i < this.loggers.length; i++) {
21+
this.loggers[i].setLevel(level);
22+
}
23+
this.level = this.levels[level || LoggerLevel.INFO];
24+
}
25+
1926
log(level, message, meta) {
2027
if (this.levels[level] <= this.level) {
2128
for (let i = 0; i < this.loggers.length; i++) {
22-
this.loggers.log(level, message, meta);
29+
this.loggers[i].log(level, message, meta);
2330
}
2431
}
2532
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alt-javascript/logger",
3-
"version": "1.1.6",
3+
"version": "1.1.7",
44
"description": "A simple configurable logging facade for javascript.",
55
"author": "",
66
"keywords": [

0 commit comments

Comments
 (0)