Change how the pretty formatter output its arguments

Author: julienw

lib/formatters/pretty.js

@@ -8,14 +8,17 @@ const intel = require('intel');
 
 function PrettyFormatter(options) {
   options = options || {};
-  options.format = '%(name)s.%(levelname)s: %(message)s';
+  options.format = '%(levelname)s %(name)s: %(message)s';
   options.colorize = true;
   intel.Formatter.call(this, options);
 }
 util.inherits(PrettyFormatter, intel.Formatter);
 
 PrettyFormatter.prototype.format = function prettyFormat(record) {
+  var name = record.args[0];
   var payload = record.args[1];
+  record.args = ['%?', payload];
+  record.name += '.' + name;
   if (typeof payload === 'object') {
     for (var key in payload) {
       if (payload[key] instanceof Error) {

test/pretty_formatter.js

@@ -33,30 +33,30 @@ describe('pretty formatter', function() {
   it('should serialize objects to JSON strings', function() {
     var obj = { foo: { bar: 'baz' }, quux: 'baz' };
     logger.info('json', obj);
-    assert.equal(lastLog, 'mozlog_pretty.test.pretty.INFO: json {"foo":{"bar":"baz"},"quux":"baz"}\n');
+    assert.equal(lastLog, 'INFO mozlog_pretty.test.pretty.json: {"foo":{"bar":"baz"},"quux":"baz"}\n');
   });
 
   it('should serialize circular objects', function() {
     var obj = { foo: {} };
     obj.foo.bar = obj;
     logger.info('jsoncircles', obj);
-    assert.equal(lastLog, 'mozlog_pretty.test.pretty.INFO: jsoncircles {"foo":{"bar":"[Circular]"}}\n');
+    assert.equal(lastLog, 'INFO mozlog_pretty.test.pretty.jsoncircles: {"foo":{"bar":"[Circular]"}}\n');
   });
 
   it('should serialize errors', function() {
     var err1 = new Error('foo');
     logger.error('errors', err1);
-    assert(lastLog.startsWith('mozlog_pretty.test.pretty.ERROR: errors Error: foo'));
+    assert(lastLog.startsWith('ERROR mozlog_pretty.test.pretty.errors: Error: foo'));
   });
 
   it('should serialize nested errors', function() {
     var err1 = new Error('foo');
     logger.error('errors', { obj: err1 });
-    assert.equal(lastLog, 'mozlog_pretty.test.pretty.ERROR: errors {"obj":"Error: foo"}\n');
+    assert.equal(lastLog, 'ERROR mozlog_pretty.test.pretty.errors: {"obj":"Error: foo"}\n');
   });
 
   it('should coerce messages to strings', function() {
     var out = logger.warn('message', 42);
-    assert.equal(lastLog, 'mozlog_pretty.test.pretty.WARN: message 42\n');
+    assert.equal(lastLog, 'WARN mozlog_pretty.test.pretty.message: 42\n');
   });
 });