diff --git a/CODEOWNERS b/CODEOWNERS index 34634bf49..a4a46bfa2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,7 +7,7 @@ # Add-on maintainers: /bundles/org.openhab.automation.groovyscripting/ @wborn /bundles/org.openhab.automation.jrubyscripting/ @boc-tothefuture -/bundles/org.openhab.automation.jsscripting/ @jpg0 +/bundles/org.openhab.automation.jsscripting/ @jpg0 @florian-h05 /bundles/org.openhab.automation.jythonscripting/ @openhab/add-ons-maintainers /bundles/org.openhab.automation.pidcontroller/ @fwolter /bundles/org.openhab.automation.pwm/ @fwolter diff --git a/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js b/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js index a39854783..b68f05ebc 100644 --- a/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js +++ b/bundles/org.openhab.automation.jsscripting/src/main/resources/node_modules/@jsscripting-globals.js @@ -19,7 +19,7 @@ function stringify (value) { try { - if (Java.isJavaObject(value)) { + if (Java.isJavaObject(value) || value instanceof Error) { return value.toString(); } else { // special cases @@ -129,20 +129,8 @@ log.error(format.apply(null, arguments)); }, - trace: function (e) { - if (Java.isJavaObject(e)) { - log.trace(e.getLocalizedMessage(), e); - } else { - if (e.stack) { - log.trace(e.stack); - } else { - if (e.message) { - log.trace(format.apply(null, [(e.name || 'Error') + ':', e.message])); - } else { - log.trace((e.name || 'Error')); - } - } - } + trace: function () { + log.trace(new Error(format.apply(null, arguments)).stack.replace(/^Error: /, '')); }, time: function (label) {