From baaebef2eda55e8b15525bee24978a12472d413c Mon Sep 17 00:00:00 2001
From: Karl Lam <karl.v.lam@gmail.com>
Date: Fri, 5 Jul 2013 15:28:10 +0800
Subject: [PATCH] GELF appender - test case covers custom fields, remove unused
 console.log

---
 lib/appenders/gelf.js     |  1 -
 test/gelfAppender-test.js | 46 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/lib/appenders/gelf.js b/lib/appenders/gelf.js
index d8f264d..0a731db 100644
--- a/lib/appenders/gelf.js
+++ b/lib/appenders/gelf.js
@@ -43,7 +43,6 @@ function gelfAppender (layout, host, port, hostname, facility, customFields) {
   layout = layout || layouts.messagePassThroughLayout;
 
   var defaultCustomFields = customFields || {};
-  console.log(defaultCustomFields)
   
   var client = dgram.createSocket("udp4");
   
diff --git a/test/gelfAppender-test.js b/test/gelfAppender-test.js
index 1f45f33..7a0541b 100644
--- a/test/gelfAppender-test.js
+++ b/test/gelfAppender-test.js
@@ -135,5 +135,51 @@ vows.describe('log4js gelfAppender').addBatch({
         assert.equal(message.facility, 'nonsense');
       }
     }
+  },
+  'with custom fields options': {
+    topic: function() {
+      var setup = setupLogging({
+        host: 'somewhere',
+        port: 12345,
+        hostname: 'cheese',
+        facility: 'nonsense',
+        customFields: {
+            _every1: 'Hello every one',
+            _every2: 'Hello every two'
+        }
+      });
+      var myFields = {
+          GELF: true,
+          _every2: 'Overwritten!',
+          _myField: 'This is my field!'
+      };
+      setup.logger.debug(myFields, "Just testing.");
+      return setup;
+    },
+    'the dgram packet': {
+      topic: function(setup) {
+        return setup.dgram;
+      },
+      'should pick up the options': function(dgram) {
+        assert.equal(dgram.socket.host, 'somewhere');
+        assert.equal(dgram.socket.port, 12345);
+      }
+    },
+    'the uncompressed packet': {
+      topic: function(setup) {
+        var message = JSON.parse(setup.compress.uncompressed);
+        return message;
+      },
+      'should pick up the options': function(message) {
+        assert.equal(message.host, 'cheese');
+        assert.equal(message.facility, 'nonsense');
+        assert.equal(message._every1, 'Hello every one'); // the default value
+        assert.equal(message._every2, 'Overwritten!'); // the overwritten value
+        assert.equal(message._myField, 'This is my field!'); // the value for this message only
+        assert.equal(message.short_message, 'Just testing.'); // skip the field object 
+        assert.equal(message.full_message, 'Just testing.'); // should be as same as short_message 
+      }
+    }
   }
+
 }).export(module);