Merge branch 'development'

.travis.yml

@@ -1,5 +1,8 @@
 language: node_js
 node_js:
+  - "4.1"
+  - "4.0"
+  - "0.12"
   - "0.10"
   - "0.8"
 before_install:

lib/winston-logstash-udp.js

@@ -46,7 +46,15 @@ util.inherits(LogstashUDP, winston.Transport);
 winston.transports.LogstashUDP = LogstashUDP;
 
 LogstashUDP.prototype.connect = function() {
+    var self = this;
     this.client = dgram.createSocket('udp4');
+
+    // Attach an error listener on the socket
+    // It can also avoid top level exceptions like UDP DNS errors thrown by the socket
+    this.client.on('error', function(err) {
+        // in node versions <= 0.12, the error event is emitted even when a callback is passed to send()
+        // we always pass a callback to send(), so it's safe to do nothing here
+    });
 };
 
 LogstashUDP.prototype.log = function(level, msg, meta, callback) {
@@ -72,9 +80,14 @@ LogstashUDP.prototype.log = function(level, msg, meta, callback) {
         json: true
     });
 
-    self.sendLog(logEntry, function() {
-        self.emit('logged', true);
-        callback(null, true);
+    self.sendLog(logEntry, function (err) {
+        if (err) {
+            self.emit('error', err);
+        } else {
+            self.emit('logged', true);
+        }
+
+        callback(err, !err);
     });
 
 };
@@ -88,7 +101,7 @@ LogstashUDP.prototype.sendLog = function(message, callback) {
 
     var buf = new Buffer(message);
 
-    callback = (callback || function() {});
+    callback = (callback || function (err) { if (err) { self.emit('error', err); } });
 
     self.client.send(buf, 0, buf.length, self.port, self.host, callback);
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "winston-logstash-udp",
-    "version": "0.0.7",
+    "version": "0.1.0",
     "description": "A Logstash UDP transport for winston",
     "main": "./lib/winston-logstash-udp",
     "homepage": "https://github.com/sazze/winston-logstash-udp",
@@ -58,6 +58,10 @@
         {
             "name": "Pierre Inglebert",
             "email": "[email protected]"
+        },
+        {
+            "name": "Kevin Danielo",
+            "email": "[email protected]"
         }
     ],
     "maintainers": [

test/winston-logstash-udp_test.js

@@ -137,4 +137,16 @@ describe('winston-logstash-udp transport', function () {
 
     });
 
+    describe('without logstash server', function () {
+        it('emit an error message if UDP DNS errors occur on the socket', function (done) {
+            var logger = createLogger(port, {host:'unresolvedhost'});
+
+            logger.transports.logstashUdp.on('error', function (err) {
+                expect(err).to.be.an.instanceof(Error);
+                done();
+            });
+
+            logger.log('info', 'hello world', {stream: 'sample'});
+        });
+    });
 });