Merge branch 'master' into dev

This commit is contained in:
Koen Kanters 2019-03-09 21:45:24 +01:00
commit 18aee4803b
3 changed files with 5 additions and 5 deletions

View File

@ -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()}`)
+ ` ${options.timestamp()} ${options.message || ''}`
+ options.meta && Object.keys(options.meta).length ? '\n\t'+ JSON.stringify(options.meta) : '',
winston.config.colorize(options.level, ' zigbee2mqtt:' + options.level.toLowerCase()) + ' ' +
options.timestamp() + ' ' + (options.message ? options.message : '') +
(options.meta && Object.keys(options.meta).length ? '\n\t'+ JSON.stringify(options.meta) : '' ),
}),
],
});

2
npm-shrinkwrap.json generated
View File

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

View File

@ -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": {