From 0324c5a3f563b676cae8b145971a96ffc1cce23a Mon Sep 17 00:00:00 2001
From: Sungmyung Lee <leesungmyung@gmail.com>
Date: Wed, 6 Apr 2016 19:46:23 +0900
Subject: [PATCH 1/2] Add tiny output for CLI

This option '-o tiny' outputs message only. It is minimal output.
---
 bin/bunyan | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/bin/bunyan b/bin/bunyan
index 3c2b082d..4b072122 100755
--- a/bin/bunyan
+++ b/bin/bunyan
@@ -11,7 +11,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.8.1';
+var VERSION = '1.8.0';
 
 var p = console.log;
 var util = require('util');
@@ -48,6 +48,7 @@ var OM_INSPECT = 3;
 var OM_SIMPLE = 4;
 var OM_SHORT = 5;
 var OM_BUNYAN = 6;
+var OM_TINY = 7;
 var OM_FROM_NAME = {
     'long': OM_LONG,
     'paul': OM_LONG,  /* backward compat */
@@ -55,7 +56,8 @@ var OM_FROM_NAME = {
     'inspect': OM_INSPECT,
     'simple': OM_SIMPLE,
     'short': OM_SHORT,
-    'bunyan': OM_BUNYAN
+    'bunyan': OM_BUNYAN,
+    'tiny': OM_TINY
 };
 
 
@@ -244,6 +246,7 @@ function printHelp() {
     p('                  bunyan: 0 indented JSON, bunyan\'s native format');
     p('                  inspect: node.js `util.inspect` output');
     p('                  short: like "long", but more concise');
+    p('                  tiny: like "long", but message only');
     p('  -j            shortcut for `-o json`');
     p('  -0            shortcut for `-o bunyan`');
     p('  -L, --time local');
@@ -750,8 +753,13 @@ function handleLogLine(file, line, opts, stylize) {
  */
 function emitRecord(rec, line, opts, stylize) {
     var short = false;
+    var tiny = false;
 
     switch (opts.outputMode) {
+    case OM_TINY:
+        tiny = true;
+        /* jsl:fall-thru */
+
     case OM_SHORT:
         short = true;
         /* jsl:fall-thru */
@@ -849,12 +857,16 @@ function emitRecord(rec, line, opts, stylize) {
         }
         delete rec.req_id;
 
-        var onelineMsg;
-        if (rec.msg.indexOf('\n') !== -1) {
-            onelineMsg = '';
-            details.push(indent(stylize(rec.msg, 'cyan')));
-        } else {
-            onelineMsg = ' ' + stylize(rec.msg, 'cyan');
+        var onelineMsg = '';
+        if (!tiny) {
+            if (rec.msg.indexOf('\n') !== -1) {
+                details.push(indent(stylize(rec.msg, 'cyan')));
+            } else {
+                onelineMsg = ' ' + stylize(rec.msg, 'cyan');
+            }
+        }
+        else {
+            onelineMsg = stylize(rec.msg, 'cyan');
         }
         delete rec.msg;
 
@@ -1045,21 +1057,26 @@ function emitRecord(rec, line, opts, stylize) {
             (extras.length ? ' (' + extras.join(', ') + ')' : ''), 'XXX');
         details = stylize(
             (details.length ? details.join('\n    --\n') + '\n' : ''), 'XXX');
-        if (!short)
-            emit(format('%s %s: %s on %s%s:%s%s\n%s',
+        if (tiny)
+            emit(format('%s%s\n%s',
+                onelineMsg,
+                extras,
+                details));
+        else if (short)
+            emit(format('%s %s %s:%s%s\n%s',
                 time,
                 level,
                 nameStr,
-                hostname || '<no-hostname>',
-                src,
                 onelineMsg,
                 extras,
                 details));
         else
-            emit(format('%s %s %s:%s%s\n%s',
+            emit(format('%s %s: %s on %s%s:%s%s\n%s',
                 time,
                 level,
                 nameStr,
+                hostname || '<no-hostname>',
+                src,
                 onelineMsg,
                 extras,
                 details));

From f5db1cfd8b6d46214be5139f71c3fc6e32614782 Mon Sep 17 00:00:00 2001
From: Sungmyung Lee <leesungmyung@gmail.com>
Date: Wed, 6 Apr 2016 20:32:36 +0900
Subject: [PATCH 2/2] Fix mistake

---
 bin/bunyan | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/bin/bunyan b/bin/bunyan
index 4b072122..0b1ed050 100755
--- a/bin/bunyan
+++ b/bin/bunyan
@@ -11,7 +11,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.8.0';
+var VERSION = '1.8.1';
 
 var p = console.log;
 var util = require('util');
@@ -858,15 +858,12 @@ function emitRecord(rec, line, opts, stylize) {
         delete rec.req_id;
 
         var onelineMsg = '';
-        if (!tiny) {
-            if (rec.msg.indexOf('\n') !== -1) {
-                details.push(indent(stylize(rec.msg, 'cyan')));
-            } else {
-                onelineMsg = ' ' + stylize(rec.msg, 'cyan');
-            }
-        }
-        else {
+        if (tiny) {
             onelineMsg = stylize(rec.msg, 'cyan');
+        } else if (rec.msg.indexOf('\n') !== -1) {
+            details.push(indent(stylize(rec.msg, 'cyan')));
+        } else {
+            onelineMsg = ' ' + stylize(rec.msg, 'cyan');
         }
         delete rec.msg;