filter output when serializing by loglevel

This commit is contained in:
Bruno Windels 2021-02-12 14:05:51 +01:00
parent 4c2abcf9c7
commit 0763410aa1
4 changed files with 96 additions and 28 deletions

View file

@ -15,18 +15,23 @@ limitations under the License.
*/ */
import {LogItem} from "./LogItem.js"; import {LogItem} from "./LogItem.js";
import {LogLevel} from "./LogLevel.js";
export class BaseLogger { export class BaseLogger {
constructor(platform) { constructor(platform, baseLogLevel) {
this._openItems = new Set(); this._openItems = new Set();
this._platform = platform; this._platform = platform;
this._baseLogLevel = baseLogLevel;
} }
wrapLog(labelOrValues, callback, logLevel) { wrapLog(labelOrValues, callback, logLevel = this._baseLogLevel) {
const item = new LogItem(labelOrValues, logLevel, this._platform); const item = new LogItem(labelOrValues, logLevel, this._platform);
const finishItem = () => { const finishItem = () => {
this._persistItem(item); const serialized = item.serialize(this._baseLogLevel);
if (serialized) {
this._persistItem(serialized);
}
this._openItems.remove(item); this._openItems.remove(item);
}; };
@ -50,11 +55,27 @@ export class BaseLogger {
} }
} }
_persistItem(item) { _finishOpenItems() {
for (const openItem of this._openItems) {
openItem.finish();
const serialized = openItem.serialize(this._baseLogLevel);
if (serialized) {
this._persistItem(serialized);
}
}
this._openItems.clear();
}
_persistItem() {
throw new Error("not implemented"); throw new Error("not implemented");
} }
async export() { async export() {
throw new Error("not implemented"); throw new Error("not implemented");
} }
// expose log level without needing
get level() {
return LogLevel;
}
} }

View file

@ -80,11 +80,7 @@ export class IDBLogger extends BaseLogger {
} }
_finishAllAndFlush() { _finishAllAndFlush() {
for (const openItem of this._openItems) { this._finishOpenItems();
openItem.finish();
this._persistItem(openItem);
}
this._openItems.clear();
this._persistQueuedItems(this._queuedItems); this._persistQueuedItems(this._queuedItems);
} }
@ -104,11 +100,11 @@ export class IDBLogger extends BaseLogger {
return openDatabase(this._name, db => db.createObjectStore("logs", {keyPath: "id"}), 1); return openDatabase(this._name, db => db.createObjectStore("logs", {keyPath: "id"}), 1);
} }
_persistItem(item) { _persistItem(serializedItem) {
this._itemCounter += 1; this._itemCounter += 1;
this._queuedItems.push({ this._queuedItems.push({
id: `${encodeUint64(item.start)}:${this._itemCounter}`, id: `${encodeUint64(serializedItem.start)}:${this._itemCounter}`,
tree: item.serialize() tree: serializedItem
}); });
} }

View file

@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import {LogLevel} from "./LogLevel.js";
export class LogItem { export class LogItem {
constructor(labelOrValues, logLevel, platform) { constructor(labelOrValues, logLevel, platform) {
this._platform = platform; this._platform = platform;
@ -58,8 +60,22 @@ export class LogItem {
return this._platform.base64.encode(buffer); return this._platform.base64.encode(buffer);
} }
serialize() { serialize(logLevel) {
let error; const children = this._children.reduce((array, c) => {
const s = c.serialize(logLevel);
if (s) {
array = array || [];
array.push(s);
}
return array;
}, null);
// neither our children or us have a loglevel high enough, bail out.
if (!children && this._logLevel < logLevel) {
return null;
}
let error = null;
if (this._error) { if (this._error) {
error = { error = {
message: this._error.message, message: this._error.message,
@ -71,7 +87,7 @@ export class LogItem {
end: this._end, end: this._end,
values: this._values, values: this._values,
error, error,
children: this._children.map(c => c.serialize()), children,
logLevel: this._logLevel logLevel: this._logLevel
}; };
} }
@ -98,26 +114,45 @@ export class LogItem {
result = callback(this); result = callback(this);
if (result instanceof Promise) { if (result instanceof Promise) {
return result.then(promiseResult => { return result.then(promiseResult => {
this._finish(); this.finish();
return promiseResult; return promiseResult;
}, err => { }, err => {
this._catch(err); this._catch(err);
this._finish(); this.finish();
throw err; throw err;
}); });
} else { } else {
this._finish(); this.finish();
return result; return result;
} }
} catch (err) { } catch (err) {
this._catch(err); this._catch(err);
this._finish(); this.finish();
throw err; throw err;
} }
} }
/**
* finished the item, recording the end time. After finishing, an item can't be modified anymore as it will be persisted.
* @internal shouldn't typically be called by hand. allows to force finish if a promise is still running when closing the app
*/
finish() {
if (this._end === null) {
for(const c of this._children) {
c.finish();
}
this._end = this._platform.clock.now();
}
}
// expose log level without needing
get level() {
return LogLevel;
}
_catch(err) { _catch(err) {
this._error = err; this._error = err;
this._logLevel = LogLevel.Error;
console.error(`log item ${this.values.label} failed: ${err.message}:\n${err.stack}`); console.error(`log item ${this.values.label} failed: ${err.message}:\n${err.stack}`);
} }
@ -129,13 +164,4 @@ export class LogItem {
this._children.push(item); this._children.push(item);
return item; return item;
} }
_finish() {
if (this._end === null) {
for(const c of this._children) {
c._finish();
}
this._end = this._platform.clock.now();
}
}
} }

25
src/logging/LogLevel.js Normal file
View file

@ -0,0 +1,25 @@
/*
Copyright 2020 Bruno Windels <bruno@windels.cloud>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
export const LogLevel = {
All: 1,
Debug: 2,
Info: 3,
Warn: 4,
Error: 5,
Fatal: 6,
Off: 7,
}