Removing automagic call add ELK

clay · Jun 23, 2017 · dca674c · dca674c
1 parent 0f1132b
commit dca674c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/services/log.js b/lib/services/log.js
@@ -34,8 +34,6 @@ winston.add(winston.transports.Console, {
 });
 winston.default.transports.console.level = logLevel;
 
-addELK(process.env.CLAY_ELK); // CLAY_ELK=domain.com:9200
-
 /**
  * @param {*} obj
  * @returns {boolean}

diff --git a/lib/services/log.test.js b/lib/services/log.test.js
@@ -14,12 +14,10 @@ describe(dirname, function () {
     beforeEach(function () {
       sandbox = sinon.sandbox.create();
       sandbox.stub(winston);
-
     });
 
     afterEach(function () {
       sandbox.restore();
-      winston.transports.Logstash = undefined;
     });
 
     describe('withStandardPrefix', function () {
@@ -70,5 +68,17 @@ describe(dirname, function () {
         sinon.assert.calledOnce(winston.log);
       });
     });
+
+    describe('addELK', function functionName() {
+      const fn = lib[this.title];
+
+      it('does not call winston.add if Logstash is already defined', function () {
+        winston.transports.Logstash = true;
+        fn('domain.com:1010');
+
+        sinon.assert.notCalled(winston.add);
+      });
+    });
+
   });
 });