diff --git a/services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerTable.js b/services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerTable.js index 01508ab7de36..4dc106574914 100644 --- a/services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerTable.js +++ b/services/static-webserver/client/source/class/osparc/component/widget/logger/LoggerTable.js @@ -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"); @@ -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 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; } @@ -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); @@ -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) { diff --git a/services/static-webserver/client/source/class/osparc/data/model/Node.js b/services/static-webserver/client/source/class/osparc/data/model/Node.js index 65ff7ae20dd1..715896b3c167 100644 --- a/services/static-webserver/client/source/class/osparc/data/model/Node.js +++ b/services/static-webserver/client/source/class/osparc/data/model/Node.js @@ -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); @@ -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); @@ -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); } @@ -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(); diff --git a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js index 0087141b3c61..1b11300be557 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js +++ b/services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js @@ -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); @@ -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);