From 0dbc4921a316a4c936375a7fa510629e1cde0e9e Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@sensis.com.au>
Date: Fri, 11 Jan 2013 15:35:00 +1100
Subject: [PATCH 1/2] Changed layouts to use util.format instead of my own
 implementation

---
 lib/layouts.js       | 38 ++++++++++----------------------------
 test/layouts-test.js | 31 +++++++++++++++----------------
 2 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/lib/layouts.js b/lib/layouts.js
index 320d12c..c0a8cc2 100644
--- a/lib/layouts.js
+++ b/lib/layouts.js
@@ -24,37 +24,19 @@ var dateFormat = require('./date_format')
     , OFF: "grey"
   };
 
-function formatLogData(logData) {
-    var output = ""
-      , data = Array.isArray(logData) ? logData.slice() : Array.prototype.slice.call(arguments)
-      , format = data.shift();
-
-    if (typeof format  === "string") {
-        output = format.replace(replacementRegExp, function(match) {
-            switch (match) {
-            case "%s": return new String(data.shift());
-            case "%d": return new Number(data.shift());
-            case "%j": return JSON.stringify(data.shift());
-            default:
-                return match;
-            };
-        });
+function wrapErrorsWithInspect(items) {
+  return items.map(function(item) {
+    if ((item instanceof Error) && item.stack) {
+      return { inspect: function() { return util.format(item) + '\n' + item.stack; } };
     } else {
-        //put it back, it's not a format string
-        data.unshift(format);
+      return item;
     }
+  });
+}
 
-    data.forEach(function (item) {
-        if (output) {
-            output += ' ';
-        }
-        output += util.inspect(item);
-        if (item && item.stack) {
-            output += "\n" + item.stack;
-        }
-    });
-
-    return output;
+function formatLogData(logData) {
+  var data = Array.isArray(logData) ? logData : Array.prototype.slice.call(arguments);
+  return util.format.apply(util, wrapErrorsWithInspect(data));
 }
 
 var styles = {
diff --git a/test/layouts-test.js b/test/layouts-test.js
index 105fd1c..26a3786 100644
--- a/test/layouts-test.js
+++ b/test/layouts-test.js
@@ -64,7 +64,7 @@ vows.describe('log4js layouts').addBatch({
                     colour: "green"
                   , toString: function() { return "ERROR"; }
                 }
-              }), "thing 1 'cheese'");
+              }), "thing 1 cheese");
           },
         'should output the first item even if it is not a string': function(layout) {
             assert.equal(layout({
@@ -89,21 +89,20 @@ vows.describe('log4js layouts').addBatch({
             }).match(/Error\s+at Object\..*\s+\((.*)test[\\\/]layouts-test\.js\:\d+\:\d+\)\s+at runTest/)
             , 'regexp did not return a match');
         },
-        'with passed augmented errors':
-        { topic:
-          function(layout){
-              var e = new Error("My Unique Error Message");
-              e.augmented = "My Unique attribute value"
-              e.augObj = { at1: "at2" }
-              return layout({
-                  data: [ e ]
-                , startTime: new Date(2010, 11, 5, 14, 18, 30, 45)
-                , categoryName: "cheese"
-                , level: {
-                    colour: "green"
-                  , toString: function() { return "ERROR"; }
-                }
-              });
+        'with passed augmented errors': { 
+          topic: function(layout){
+            var e = new Error("My Unique Error Message");
+            e.augmented = "My Unique attribute value"
+            e.augObj = { at1: "at2" }
+            return layout({
+              data: [ e ]
+              , startTime: new Date(2010, 11, 5, 14, 18, 30, 45)
+              , categoryName: "cheese"
+              , level: {
+                colour: "green"
+                , toString: function() { return "ERROR"; }
+              }
+            });
           },
           'should print error the contained error message': function(layoutOutput) {
               var m = layoutOutput.match(/\{ \[Error: My Unique Error Message\]/);

From c9a890b37b2eb5456582d10e24a1fca8bbc993dd Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@sensis.com.au>
Date: Tue, 12 Feb 2013 07:23:18 +1100
Subject: [PATCH 2/2] added some test output files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c9a0c8b..ee0fdab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 build
 node_modules
 
+test/streams/test-rolling-file-stream*