diff --git a/utils/lib.js b/utils/lib.js index 9c82b7c..5e3aef9 100644 --- a/utils/lib.js +++ b/utils/lib.js @@ -1,6 +1,5 @@ -console.loggerName = 'js.lib'; -console.log('Load lib module'); - +const log = Java.type('org.slf4j.LoggerFactory').getLogger('js.lib'); +log.info('Load lib module'); function compare(a, b, operator) { // Hint: a = currentState, b = targetState @@ -28,7 +27,7 @@ function compare(a, b, operator) { returnValue = a.greaterThanOrEqual(b); break; default: - console.error(`${operator} is no valid operator`); + log.error(`${operator} is no valid operator`); return; } } catch(e) { @@ -55,12 +54,12 @@ function compare(a, b, operator) { } } - console.debug(logMsg); + log.debug(logMsg); return returnValue; } function convertValue(value) { - console.debug('Converting value ' + value + ' of type ' + typeof value); + log.debug('Converting value ' + value + ' of type ' + typeof value); if(typeof value === 'string') { if(value.includes(' ')) { let logMsg = ''; @@ -72,26 +71,26 @@ function convertValue(value) { logMsg = 'Not a Quantity but has a space, leaving as a string: ' + value; returnValue = value; } finally { - console.debug(logMsg); + log.debug(logMsg); return returnValue; } } else if(!isNaN(value)) { - console.debug('Number: ' + value) + log.debug('Number: ' + value) return Number.parseFloat(value); } else if(value == 'UnDefType' || value == 'NULL' || value == 'UNDEF') { - console.debug('UnDefType: ' + value); + log.debug('UnDefType: ' + value); return 'UnDefType'; } - console.debug('String: ' + value); + log.debug('String: ' + value); return value; } else if(value instanceof DecimalType || value instanceof PercentType) { - console.debug('DecimalType or PercentType: ' + value); + log.debug('DecimalType or PercentType: ' + value); return value.floatValue(); } else if(value instanceof QuantityType) { - console.debug('QuantityType: ' + value); + log.debug('QuantityType: ' + value); return Quantity(value); } else { - console.debug('String: ' + value); + log.debug('String: ' + value); return value.toString(); } } @@ -120,7 +119,7 @@ function distanceFrom(locationA, locationB) { // calculate the result let result = `${(c * r).toFixed()} m` - console.debug(`Calculated distance between ${locationA} and ${locationB} is ${result}`); + log.debug(`Calculated distance between ${locationA} and ${locationB} is ${result}`); return result; }