@eclipse-glsp-examples/workflow-server-bundled 2.4.0-next.119 → 2.4.0-next.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-server-bundled",
-  "version": "2.4.0-next.119+86e89a1",
+  "version": "2.4.0-next.121+35d8055",
   "description": "GLSP node server for the workflow example (bundled)",
   "keywords": [
     "eclipse",
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "86e89a196104c33a8121ecbb17390c0e3520a9bd"
+  "gitHead": "35d805558ea1c8e40ec0b59d5144e41210b55038"
 }

package/wf-glsp-server-node.js

@@ -66997,42 +66997,45 @@ let ConsoleLogger = class ConsoleLogger extends logger_1.Logger {
     }
     info(message, ...params) {
         if (logger_1.LogLevel.info <= this.logLevel) {
-            console.info(this.logMessage(message, params));
+            console.info(this.logMessage(logger_1.LogLevel.info, message, ...params));
         }
     }
     warn(message, ...params) {
         if (logger_1.LogLevel.warn <= this.logLevel) {
-            console.warn(this.logMessage(message, params));
+            console.warn(this.logMessage(logger_1.LogLevel.warn, message, ...params));
         }
     }
     error(message, ...params) {
         if (logger_1.LogLevel.error <= this.logLevel) {
-            console.error(this.logMessage(message, params));
+            console.error(this.logMessage(logger_1.LogLevel.error, message, ...params));
         }
     }
     debug(message, ...params) {
         if (logger_1.LogLevel.debug <= this.logLevel) {
-            console.debug(this.logMessage(message, params));
+            console.debug(this.logMessage(logger_1.LogLevel.debug, message, ...params));
         }
     }
-    logMessage(message, ...params) {
-        const timestamp = new Date().toLocaleTimeString();
-        const caller = this.caller ? `[${this.caller}]` : '';
-        const additional = this.logAdditionals(...params);
-        return `${timestamp} ${this.logLevel} - ${caller} ${message} ${additional}`;
+    logMessage(level, message, ...params) {
+        return `${this.logTimestamp()} ${(0, logger_1.asLogLevel)(level)} - ${this.logCaller()} ${message} ${this.logAdditionals(...params)}`;
+    }
+    logCaller() {
+        return this.caller ? `[${this.caller}]` : '';
+    }
+    logTimestamp() {
+        return new Date().toLocaleTimeString();
     }
     logAdditionals(...params) {
-        if (!params || params.length === 0) {
-            return '';
-        }
-        return params.map(param => this.stringify(param)).join(',\n');
+        return !params || params.length === 0 ? '' : params.map(param => this.stringify(param)).join(this.logAdditionalsSeparator());
+    }
+    logAdditionalsSeparator() {
+        return ',\n';
     }
     stringify(param) {
-        if (param instanceof Error) {
-            return `${param.message}
-            ${param.stack || ''}`;
-        }
-        return JSON.stringify(param, undefined, 4);
+        return param instanceof Error ? this.stringifyError(param) : JSON.stringify(param, undefined, 4);
+    }
+    stringifyError(error) {
+        return `${error.message}
+        ${error.stack || ''}`;
     }
 };
 exports.ConsoleLogger = ConsoleLogger;
@@ -67822,7 +67825,6 @@ exports.createWinstonInstance = createWinstonInstance;
  * @param baseLoggerCreator The underling global {@link winston.Logger} instance.
  */
 function configureWinstonLogger(context, options, rebind = true, baseLoggerCreator = createWinstonInstance) {
-    const baseLogger = baseLoggerCreator(options);
     if (rebind) {
         if (context.isBound(common_1.Logger)) {
             context.unbind(common_1.Logger);
@@ -67831,12 +67833,18 @@ function configureWinstonLogger(context, options, rebind = true, baseLoggerCreat
             context.unbind(common_1.LoggerFactory);
         }
     }
-    context.bind(common_1.Logger).toDynamicValue(dynamicContext => new winston_logger_1.WinstonLogger(baseLogger, (0, common_1.getRequestParentName)(dynamicContext)));
     context.bind(common_1.LoggerFactory).toFactory(dynamicContext => (caller) => {
         const logger = dynamicContext.container.get(common_1.Logger);
         logger.caller = caller;
         return logger;
     });
+    // if no logging is enabled, bind the NullLogger
+    if (!options.consoleLog && !options.fileLog) {
+        context.bind(common_1.Logger).to(common_1.NullLogger).inSingletonScope();
+        return;
+    }
+    const baseLogger = baseLoggerCreator(options);
+    context.bind(common_1.Logger).toDynamicValue(dynamicContext => new winston_logger_1.WinstonLogger(baseLogger, (0, common_1.getRequestParentName)(dynamicContext)));
 }
 exports.configureWinstonLogger = configureWinstonLogger;