Skip to content

🎨 Frontend: map LogLevel #4246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 17, 2023
Merged

🎨 Frontend: map LogLevel #4246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b0bb91
minor
odeimaiz May 17, 2023
6f24a05
minor
odeimaiz May 17, 2023
8a42a3f
minors
odeimaiz May 17, 2023
1d4a655
LOG_LEVEL_MAP
odeimaiz May 17, 2023
fb0f5db
minor
odeimaiz May 17, 2023
cd0814a
tpUpperCase
odeimaiz May 17, 2023
b984575
Merge branch 'master' into feature/log-level
odeimaiz May 17, 2023
3e2a29d
Merge branch 'master' into feature/log-level
odeimaiz May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
let logColor = null;
const logLevels = osparc.component.widget.logger.LoggerView.LOG_LEVELS;
Object.keys(logLevels).forEach(logLevelKey => {
const logString = logLevelKey;
const logString = logLevelKey.toLowerCase();
const logNumber = logLevels[logLevelKey];
if (logNumber === logLevel) {
logColor = colorManager.resolve("logger-"+logString+"-message");
Expand Down Expand Up @@ -151,22 +151,6 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
return this.__filteredData.length;
},

// overloaded - called whenever the table requests the row count
_loadRowCount : function() {
this.__filteredData = [];
for (let i=0; i<this.__rawData.length; i++) {
const rowData = this.__rawData[i];
if (this.__checkFilters(rowData)) {
this.__filteredData.push(rowData);
}
}
this.__setRowCount(this.__filteredData.length);
},

_loadRowData : function(firstRow, lastRow) {
this.__rowDataLoadded(firstRow, lastRow);
},

__filterByString: function(msg) {
let searchString = this.getFilterString();
if (searchString === null || searchString === "") {
Expand All @@ -193,16 +177,32 @@ qx.Class.define("osparc.component.widget.logger.LoggerTable", {
return ((showStrWho || showStrWhat) && showLog);
},

// overloaded - called whenever the table requests the row count
_loadRowCount : function() {
this.__filteredData = [];
for (let i=0; i<this.__rawData.length; i++) {
const rowData = this.__rawData[i];
if (this.__checkFilters(rowData)) {
this.__filteredData.push(rowData);
}
}
this.__setRowCount(this.__filteredData.length);
},

_loadRowData : function(firstRow, lastRow) {
this.__rowDataLoadded(firstRow, lastRow);
},

// Fake the server localy
__setRowCount : function(number) {
var self = this;
const self = this;
self._onRowCountLoaded(number);
},

__rowDataLoadded : function(firstRow, lastRow) {
var self = this;
var data = [];
for (var i=firstRow; i<=lastRow; i++) {
const self = this;
const data = [];
for (let i=firstRow; i<=lastRow; i++) {
data.push(this.__filteredData[i]);
}
self._onRowDataLoaded(data);
Expand Down
48 changes: 34 additions & 14 deletions services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,24 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
},

LOG_LEVELS: {
debug: -1,
info: 0,
warning: 1,
error: 2
DEBUG: -1,
INFO: 0,
WARNING: 1,
ERROR: 2
},

LOG_LEVEL_MAP: {
10: "DEBUG",
20: "INFO",
30: "WARNING",
40: "ERROR",
50: "ERROR" // CRITICAL
},

logLevel2Str: function(logLevel) {
const pairFound = Object.entries(this.LOG_LEVELS).find(pair => pair[1] === logLevel);
const pairFound = Object.entries(this.LOG_LEVELS).find(pair => pair[1] === logLevel.toUpperCase());
if (pairFound && pairFound.length) {
return pairFound[0].toUpperCase();
return pairFound[0];
}
return undefined;
}
Expand Down Expand Up @@ -147,7 +155,7 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
let logLevelSet = false;
Object.keys(this.self().LOG_LEVELS).forEach(logLevelKey => {
const logLevel = this.self().LOG_LEVELS[logLevelKey];
if (logLevelKey === "debug" && !osparc.data.Permissions.getInstance().canDo("study.logger.debug.read")) {
if (logLevelKey === "DEBUG" && !osparc.data.Permissions.getInstance().canDo("study.logger.debug.read")) {
return;
}
const label = qx.lang.String.firstUp(logLevelKey);
Expand Down Expand Up @@ -303,23 +311,35 @@ qx.Class.define("osparc.component.widget.logger.LoggerView", {
},

debug: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.debug);
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.DEBUG);
},

info: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.info);
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.INFO);
},

warn: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.WARNING);
},

error: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.ERROR);
},

debugs: function(nodeId, msgs = [""]) {
this.__addLogs(nodeId, msgs, this.self().LOG_LEVELS.DEBUG);
},

infos: function(nodeId, msgs = [""]) {
this.__addLogs(nodeId, msgs, this.self().LOG_LEVELS.info);
this.__addLogs(nodeId, msgs, this.self().LOG_LEVELS.INFO);
},

warn: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.warning);
warns: function(nodeId, msgs = [""]) {
this.__addLogs(nodeId, msgs, this.self().LOG_LEVELS.WARNING);
},

error: function(nodeId, msg = "") {
this.__addLogs(nodeId, [msg], this.self().LOG_LEVELS.error);
errors: function(nodeId, msgs = [""]) {
this.__addLogs(nodeId, msgs, this.self().LOG_LEVELS.ERROR);
},

__addLogs: function(nodeId, msgs = [""], logLevel = 0) {
Expand Down
12 changes: 8 additions & 4 deletions services/static-webserver/client/source/class/osparc/data/model/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,8 @@ qx.Class.define("osparc.data.model.Node", {
const msg = "Starting " + metaData.key + ":" + metaData.version + "...";
const msgData = {
nodeId: this.getNodeId(),
msg: msg
msg,
level: "INFO"
};
this.fireDataEvent("showInLogger", msgData);

Expand All @@ -1242,7 +1243,8 @@ qx.Class.define("osparc.data.model.Node", {
const msg = "Stopping " + metaData.key + ":" + metaData.version + "...";
const msgData = {
nodeId: this.getNodeId(),
msg: msg
msg: msg,
level: "INFO"
};
this.fireDataEvent("showInLogger", msgData);

Expand Down Expand Up @@ -1278,7 +1280,8 @@ qx.Class.define("osparc.data.model.Node", {
`reported "${serviceMessage}"`;
const msgData = {
nodeId: this.getNodeId(),
msg: msg
msg: msg,
level: "INFO"
};
this.fireDataEvent("showInLogger", msgData);
}
Expand Down Expand Up @@ -1446,7 +1449,8 @@ qx.Class.define("osparc.data.model.Node", {
const msg = "Service ready on " + srvUrl;
const msgData = {
nodeId: this.getNodeId(),
msg: msg
msg,
level: "INFO"
};
this.fireDataEvent("showInLogger", msgData);
this.__restartIFrame();
Expand Down
35 changes: 30 additions & 5 deletions services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,10 +597,20 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
const data = e.getData();
const nodeId = data.nodeId;
const msg = data.msg;
if ("level" in data && data["level"] === "ERROR") {
this.__loggerView.error(nodeId, msg);
} else {
this.__loggerView.info(nodeId, msg);
const logLevel = ("level" in data) ? data["level"] : "INFO";
switch (logLevel) {
case "DEBUG":
this.__loggerView.debug(nodeId, msg);
break;
case "WARNING":
this.__loggerView.warn(nodeId, msg);
break;
case "ERROR":
this.__loggerView.error(nodeId, msg);
break;
default:
this.__loggerView.info(nodeId, msg);
break;
}
}, this);

Expand Down Expand Up @@ -629,7 +639,22 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
}
const nodeId = data["node_id"];
const messages = data["messages"];
this.__loggerView.infos(nodeId, messages);
const logLevelMap = osparc.component.widget.logger.LoggerView.LOG_LEVEL_MAP;
const logLevel = ("log_level" in data) ? logLevelMap[data["log_level"]] : "INFO";
switch (logLevel) {
case "DEBUG":
this.__loggerView.debugs(nodeId, messages);
break;
case "WARNING":
this.__loggerView.warns(nodeId, messages);
break;
case "ERROR":
this.__loggerView.errors(nodeId, messages);
break;
default:
this.__loggerView.infos(nodeId, messages);
break;
}
const nodeLogger = this.__getNodeLogger(nodeId);
if (nodeLogger) {
nodeLogger.infos(nodeId, messages);
Expand Down