From 2b6dc579ef6f39a387112d9cbae70ea2eac6f368 Mon Sep 17 00:00:00 2001
From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Mon, 28 Sep 2015 15:11:28 +0300
Subject: [PATCH 1/3] Added a debugging log stream for pretty console logging

---
 lib/logger.js | 10 +++++++++-
 package.json  |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/logger.js b/lib/logger.js
index e8f7ff9..fdabf5e 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -4,7 +4,7 @@ var extend = require('extend');
 var bunyan = require('bunyan');
 var gelfStream = require('gelf-stream');
 var syslogStream = require('bunyan-syslog-udp');
-
+var PrettyStream = require('bunyan-prettystream');
 
 var DEF_LEVEL = 'warn';
 var LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal'];
@@ -59,6 +59,14 @@ var streamConverter = {
             level: stream.level || conf.level
         };
     },
+    debug: function(stream, conf) {
+        var prettyStream = new PrettyStream();
+        prettyStream.pipe(process.stdout);
+        return {
+            stream: prettyStream,
+            level: stream.level || conf.level
+        }
+    },
     stderr: function(stream, conf) {
         return {
             stream: process.stderr,
diff --git a/package.json b/package.json
index 3182e31..b9e2789 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "service-runner",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Generic nodejs service supervisor / cluster runner",
   "main": "service-runner.js",
   "bin": {
@@ -42,6 +42,7 @@
   "devDependencies": {
     "mocha": "^2.4.5",
     "mocha-jshint": "^2.3.0",
-    "mocha-jscs": "^4.2.0"
+    "mocha-jscs": "^4.2.0",
+    "bunyan-prettystream": "^0.1.3"
   }
 }

From 2a6349f4256feef1ec5c3322cc24e7794e4428aa Mon Sep 17 00:00:00 2001
From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Mon, 25 Apr 2016 16:02:17 -0700
Subject: [PATCH 2/3] Fixed jshint failure

---
 lib/logger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/logger.js b/lib/logger.js
index fdabf5e..0d5044b 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -65,7 +65,7 @@ var streamConverter = {
         return {
             stream: prettyStream,
             level: stream.level || conf.level
-        }
+        };
     },
     stderr: function(stream, conf) {
         return {

From 4f6aa2834950ce1f7267f31e20e826cd618a5774 Mon Sep 17 00:00:00 2001
From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Mon, 25 Apr 2016 16:10:28 -0700
Subject: [PATCH 3/3] Use a fork of bunyan-prettystream

---
 lib/logger.js | 19 ++++++++++++-------
 package.json  |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/logger.js b/lib/logger.js
index 0d5044b..54d6bef 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -4,7 +4,6 @@ var extend = require('extend');
 var bunyan = require('bunyan');
 var gelfStream = require('gelf-stream');
 var syslogStream = require('bunyan-syslog-udp');
-var PrettyStream = require('bunyan-prettystream');
 
 var DEF_LEVEL = 'warn';
 var LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'fatal'];
@@ -60,12 +59,18 @@ var streamConverter = {
         };
     },
     debug: function(stream, conf) {
-        var prettyStream = new PrettyStream();
-        prettyStream.pipe(process.stdout);
-        return {
-            stream: prettyStream,
-            level: stream.level || conf.level
-        };
+        try {
+            var PrettyStream = require('bunyan-prettystream');
+            var prettyStream = new PrettyStream();
+            prettyStream.pipe(process.stdout);
+            return {
+                stream: prettyStream,
+                level: stream.level || conf.level
+            };
+        } catch (e) {
+            console.log('Could not set up pretty logging stream', e);
+            return streamConverter.stdout(stream, conf);
+        }
     },
     stderr: function(stream, conf) {
         return {
diff --git a/package.json b/package.json
index b9e2789..4307d8d 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,6 @@
     "mocha": "^2.4.5",
     "mocha-jshint": "^2.3.0",
     "mocha-jscs": "^4.2.0",
-    "bunyan-prettystream": "^0.1.3"
+    "bunyan-prettystream": "git+https://github.com/hadfieldn/node-bunyan-prettystream#master"
   }
 }