From 4ffe9438e0db8172c4223da27d9007d17c1a0b90 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 22 Nov 2017 16:10:03 +0100
Subject: Fix add logger bug

In case you want to have only the console, it will fail at the `Winston.add`
as it is already there.
---
 server/logger.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/logger.js b/server/logger.js
index 70caa292..ae4a6338 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -3,6 +3,8 @@ Meteor.startup(() => {
   require('winston-zulip');
   const fs = require('fs');
 
+  //remove default logger
+  Winston.remove(Winston.transports.Console);
   const loggerEnable = process.env.LOGGER_ENABLE || false;
   if (loggerEnable) {
 
@@ -15,9 +17,6 @@ Meteor.startup(() => {
         json: true,
         timestamp: true,
       });
-    } else {
-      //remove default logger
-      Winston.remove(Winston.transports.Console);
     }
 
     if (loggers.includes('file')) {
@@ -57,9 +56,6 @@ Meteor.startup(() => {
       Winston.log('info', `zulipconfig ${zulipConfig}`);
     }
 
-  } else {
-    //remove default logger
-    Winston.remove(Winston.transports.Console);
   }
   Winston.log('info', 'Logger is completly instanciate');
 });
-- 
cgit v1.2.3-1-g7c22


From 7f8f6bf3dbe4348907085968cd28ec19f69b5384 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 22 Nov 2017 16:10:18 +0100
Subject: Make logger enabled by default

---
 server/logger.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/logger.js b/server/logger.js
index ae4a6338..4a32c0ef 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -5,7 +5,8 @@ Meteor.startup(() => {
 
   //remove default logger
   Winston.remove(Winston.transports.Console);
-  const loggerEnable = process.env.LOGGER_ENABLE || false;
+
+  const loggerEnable = process.env.LOGGER_ENABLE || true;
   if (loggerEnable) {
 
     Winston.log('info', 'logger is enable');
-- 
cgit v1.2.3-1-g7c22


From b03c9b987959d35324295c7cb49b5c6904ebda43 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 22 Nov 2017 16:10:43 +0100
Subject: Fix bug when LOGGER is enabled, but LOGGERS is empty.

---
 server/logger.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/logger.js b/server/logger.js
index 4a32c0ef..6d7be96d 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -10,8 +10,12 @@ Meteor.startup(() => {
   if (loggerEnable) {
 
     Winston.log('info', 'logger is enable');
-    const loggers = process.env.LOGGERS.split(',') || 'console';
-    Winston.log('info',  `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`);
+    if (process.env.LOGGERS) {
+      const loggers = process.env.LOGGERS.split(',') || 'console';
+      Winston.log('info',  `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`);
+    } else {
+      const loggers = 'console';
+    }
 
     if (loggers.includes('console')) {
       Winston.add(Winston.transports.Console, {
@@ -58,6 +62,7 @@ Meteor.startup(() => {
     }
 
   }
+
   Winston.log('info', 'Logger is completly instanciate');
 });
 
-- 
cgit v1.2.3-1-g7c22


From ebff813f99f0dc7463b482d4ad16a21dad87d139 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 23 Nov 2017 10:07:49 +0100
Subject: Try to fix build

---
 server/logger.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/logger.js b/server/logger.js
index 6d7be96d..de223951 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -10,12 +10,7 @@ Meteor.startup(() => {
   if (loggerEnable) {
 
     Winston.log('info', 'logger is enable');
-    if (process.env.LOGGERS) {
-      const loggers = process.env.LOGGERS.split(',') || 'console';
-      Winston.log('info',  `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`);
-    } else {
-      const loggers = 'console';
-    }
+    const loggers = process.env.LOGGERS ? process.env.LOGGERS.split(',') : 'console'
 
     if (loggers.includes('console')) {
       Winston.add(Winston.transports.Console, {
-- 
cgit v1.2.3-1-g7c22


From ee2236435480186f6b54090f9093b7a9132d746c Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 23 Nov 2017 10:07:49 +0100
Subject: Try to fix build

---
 server/logger.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/logger.js b/server/logger.js
index 6d7be96d..cb06682f 100644
--- a/server/logger.js
+++ b/server/logger.js
@@ -10,12 +10,7 @@ Meteor.startup(() => {
   if (loggerEnable) {
 
     Winston.log('info', 'logger is enable');
-    if (process.env.LOGGERS) {
-      const loggers = process.env.LOGGERS.split(',') || 'console';
-      Winston.log('info',  `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`);
-    } else {
-      const loggers = 'console';
-    }
+    const loggers = process.env.LOGGERS ? process.env.LOGGERS.split(',') : 'console';
 
     if (loggers.includes('console')) {
       Winston.add(Winston.transports.Console, {
-- 
cgit v1.2.3-1-g7c22