fix: change the way we handle new lines in logger

mattallty · Feb 26, 2017 · 635fa9b · 635fa9b
1 parent aabee81
commit 635fa9b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/logger.js b/lib/logger.js
@@ -17,7 +17,7 @@ CaporalTransport.prototype.log = function (level, msg, meta, callback) {
   }
   const levelInt = winston.levels[level];
   const stdio = levelInt <= 1 ? 'stderr' : 'stdout';
-  process[stdio].write(msg + "\n");
+  process[stdio].write(msg);
   callback(null, true, stdio);
 };
 

diff --git a/lib/program.js b/lib/program.js
@@ -70,7 +70,7 @@ class Program extends GetterSetter {
    * @private
    */
   fatalError(errObj) {
-    this.logger().error(errObj.message);
+    this.logger().error("\n" + errObj.message);
     process.exit(2);
   }
 

diff --git a/tests/fatal-error.js b/tests/fatal-error.js
@@ -11,7 +11,7 @@ program.
 describe("program.fataError()", () => {
 
   it(`should call logger.error() and exit(2)`, () => {
-    const error = sinon.stub(logger, 'error').withArgs("foo");
+    const error = sinon.stub(logger, 'error').withArgs("\nfoo");
     const exit = sinon.stub(process, 'exit').withArgs(2);
 
     program.fatalError(new Error("foo"));

diff --git a/tests/logger.js b/tests/logger.js
@@ -22,7 +22,7 @@ describe('logger', () => {
     const oldWrite = process.stdout.write;
     process.stdout.write = write;
 
-    should(stripColor(logStr)).be.eql("foo\nfoo: bar\n");
+    should(stripColor(logStr)).be.eql("foo\nfoo: bar");
     should(callback.called).be.ok();
     should(oldWrite.called).be.ok();
   });
@@ -44,7 +44,7 @@ describe('logger', () => {
     const oldWrite = process.stderr.write;
     process.stderr.write = write;
 
-    should(stripColor(logStr)).be.eql("foo\nfoo: bar\n");
+    should(stripColor(logStr)).be.eql("foo\nfoo: bar");
     should(callback.called).be.ok();
     should(oldWrite.called).be.ok();
 
@@ -65,7 +65,7 @@ describe('logger', () => {
     const oldWrite = process.stdout.write;
     process.stdout.write = write;
 
-    should(stripColor(logStr)).be.eql("foo\n");
+    should(stripColor(logStr)).be.eql("foo");
     should(callback.called).be.ok();
     should(oldWrite.called).be.ok();