core: use host OS specific line endings

Rather than just forcing LF line endings everywhere, allow for CR/LF when running on Windows. Signed-off-by: Ryan Graham <[email protected]>
strongloop · Dec 12, 2018 · 71af900 · 71af900
1 parent 907a21f
commit 71af900
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/logger.js b/lib/logger.js
@@ -5,6 +5,7 @@
 
 'use strict';
 
+var os = require('os');
 var util = require('util');
 
 var StringDecoder = require('string_decoder').StringDecoder;
@@ -104,7 +105,7 @@ function reLiner() {
 
   function appendNewline(line, _enc, callback) {
     this.push(line);
-    callback(null, Buffer.from('\n'));
+    callback(null, Buffer.from(os.EOL));
   }
 }
 
@@ -143,7 +144,7 @@ function textFormatter(options) {
     if (options.timeStamp) {
       line = util.format('%s %s', new Date(logEvent.time).toISOString(), line);
     }
-    callback(null, line.replace(/\n/g, '\\n'));
+    callback(null, line.replace(/\r?\n/g, '\\n'));
   }
 
   function textifyTags(tags) {
@@ -190,7 +191,7 @@ function lineMerger(host) {
   function lineMergerWrite(line, _enc, callback) {
     if (/^\s+/.test(line.msg)) {
       if (previousLine) {
-        previousLine.msg += '\n' + line.msg;
+        previousLine.msg += os.EOL + line.msg;
       } else {
         previousLine = line;
       }