From 925256fdbd548fbad07b35d7a3e71aa4a03aa790 Mon Sep 17 00:00:00 2001
From: Evgenii Abramov <john.abramov@gmail.com>
Date: Sun, 16 May 2021 02:28:29 +0300
Subject: [PATCH] c

---
 app.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index 15a56df..3e7a4f6 100644
--- a/app.js
+++ b/app.js
@@ -3,8 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 /* */
-const { createLogger, format, transports } = require('winston');
-const { combine, timestamp, printf } = format;
+const {createLogger, format, transports} = require('winston');
+const {combine, timestamp, label, printf} = format;
 /* express and https */
 const ejs = require('ejs');
 const express = require('express');
@@ -26,16 +26,17 @@ const Device = require('./device');
 /* Logging */
 global.logger = createLogger({
     level: 'info',
-    // format: winston.format.json(),
     format: combine(
+        label(),
         timestamp(),
-        printf(({ level, message, timestamp }) => {
-            return `${timestamp} ${level}: ${message}`;
+        printf(({level, message, timestamp, label}) => {
+            return `${timestamp} [${label}] ${level}: ${message}`;
         })
     ),
     transports: [
-        new transports.File({filename: 'yandex2mqtt.log'}),
         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.on('data', d => {
-                    global.logger.log({
-                        level: 'info',
-                        message: `${d}`
-                    });
+                    global.logger.log('info', 'notification', {message: `${d}`});
                     // process.stdout.write(d);
                 });
             });
                 
             req.on('error', error => {
-                // console.error(error)
+                global.logger.log('error', 'notification', {message: `${error}`});
             });
             
             let {id, capabilities, properties} = ldevice.getState();