Merge branch 'master' into dev

lib/util/logger.js

@@ -30,9 +30,9 @@ const logger = new winston.Logger({
         new winston.transports.Console({
             timestamp: () => new Date().toLocaleString(),
             formatter: (options) =>
-                winston.config.colorize(options.level, `  zigbee2mqtt:${options.level.toLowerCase()}`)
+                winston.config.colorize(options.level, '  zigbee2mqtt:' + options.level.toLowerCase()) + ' ' +
-                + ` ${options.timestamp()} ${options.message || ''}`
+                options.timestamp() + ' ' + (options.message ? options.message : '') +
-                + options.meta && Object.keys(options.meta).length ? '\n\t'+ JSON.stringify(options.meta) : '',
+                (options.meta && Object.keys(options.meta).length ? '\n\t'+ JSON.stringify(options.meta) : '' ),
         }),
     ],
 });

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Zigbee to MQTT bridge using zigbee-shepherd",
   "main": "index.js",
   "repository": {