From 8f1623a000b3c23786a7106198d047b69b47a363 Mon Sep 17 00:00:00 2001
From: Jussi Vatjus-Anttila <jussi.vatjus-anttila@arm.com>
Date: Mon, 3 Sep 2018 09:21:04 +0300
Subject: [PATCH] remove winston splat support (#207)

* remove winston splat support - it is not needed
 and causing unexpected exception: winstonjs/logform#40
---
 app/index.js        | 4 ++--
 app/server.js       | 4 ++--
 app/tools/logger.js | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/index.js b/app/index.js
index c6cfbc5b..79350786 100644
--- a/app/index.js
+++ b/app/index.js
@@ -60,8 +60,8 @@ DB.connect()
   .then(() => {
     function onError(error) {
       if (error.code === 'EACCES' && port < 1024) {
-        console.error("You haven't access to open port below 1024"); // eslint-disable-line no-console
-        console.error("Please use admin rights if you wan't to use port %d!", port); // eslint-disable-line no-console
+        console.error('You haven not access to open port below 1024'); // eslint-disable-line no-console
+        console.error(`Please use admin rights if you wan't to use port ${port}!`); // eslint-disable-line no-console
       } else if (error.code === 'EADDRINUSE') {
         console.error(`Port ${port} is already in use`); // eslint-disable-line no-console
       } else {
diff --git a/app/server.js b/app/server.js
index fa1586e8..04f92783 100644
--- a/app/server.js
+++ b/app/server.js
@@ -13,11 +13,11 @@ const sslcertCrt = config.get('sslcertCrt');
 function createServer(app) {
   if (config.get('https')) {
     if (!fs.existsSync(sslcertKey)) {
-      logger.error('ssl cert key is missing: %s', sslcertKey);
+      logger.error(`ssl cert key is missing: ${sslcertKey}`);
       process.exit(1);
     }
     if (!fs.existsSync(sslcertCrt)) {
-      logger.error('ssl cert crt is missing: %s', sslcertCrt);
+      logger.error(`ssl cert crt is missing: ${sslcertCrt}`);
       process.exit(1);
     }
     const key = fs.readFileSync(sslcertKey);
diff --git a/app/tools/logger.js b/app/tools/logger.js
index 9a6b00e3..b8398cb9 100644
--- a/app/tools/logger.js
+++ b/app/tools/logger.js
@@ -41,7 +41,6 @@ class MasterLogger {
       format: format.combine(
         format.colorize(),
         format.timestamp(),
-        format.splat(),
         format.printf(info => `${info.timestamp} ${info.level}: ${info.message}`)
       )
     };
@@ -76,8 +75,8 @@ class MasterLogger {
     try {
       this.logger.log(level, ...args);
     } catch (error) {
-      this.logger.error(data);
-      this.logger.error(error);
+      console.error(error); // eslint-disable-line no-console
+      console.error(data); // eslint-disable-line no-console
     }
   }
   log(level, ...args) {