This commit is contained in:
Evgenii Abramov
2021-05-16 02:28:29 +03:00
parent 9e83f8ea21
commit 925256fdbd

20
app.js
View File

@@ -3,8 +3,8 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
/* */ /* */
const { createLogger, format, transports } = require('winston'); const {createLogger, format, transports} = require('winston');
const { combine, timestamp, printf } = format; const {combine, timestamp, label, printf} = format;
/* express and https */ /* express and https */
const ejs = require('ejs'); const ejs = require('ejs');
const express = require('express'); const express = require('express');
@@ -26,16 +26,17 @@ const Device = require('./device');
/* Logging */ /* Logging */
global.logger = createLogger({ global.logger = createLogger({
level: 'info', level: 'info',
// format: winston.format.json(),
format: combine( format: combine(
label(),
timestamp(), timestamp(),
printf(({ level, message, timestamp }) => { printf(({level, message, timestamp, label}) => {
return `${timestamp} ${level}: ${message}`; return `${timestamp} [${label}] ${level}: ${message}`;
}) })
), ),
transports: [ transports: [
new transports.File({filename: 'yandex2mqtt.log'}),
new transports.Console(), new transports.Console(),
new transports.File({filename: 'log/info.log'}),
new transports.File({filename: 'log/error.log', level: 'error'}),
], ],
}); });
@@ -147,16 +148,13 @@ global.mqttClient = mqtt.connect(`mqtt://${config.mqtt.host}`, {
} }
}, res => { }, res => {
res.on('data', d => { res.on('data', d => {
global.logger.log({ global.logger.log('info', 'notification', {message: `${d}`});
level: 'info',
message: `${d}`
});
// process.stdout.write(d); // process.stdout.write(d);
}); });
}); });
req.on('error', error => { req.on('error', error => {
// console.error(error) global.logger.log('error', 'notification', {message: `${error}`});
}); });
let {id, capabilities, properties} = ldevice.getState(); let {id, capabilities, properties} = ldevice.getState();