From 43bef967998f016527dd7bbc04934057722d1467 Mon Sep 17 00:00:00 2001 From: Did Date: Mon, 20 Jun 2016 10:08:32 +0200 Subject: [PATCH 1/6] Fixes #393 - catch error when sending UDP packet to GELF server --- lib/appenders/gelf.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/appenders/gelf.js b/lib/appenders/gelf.js index e698f7e..508bfbf 100644 --- a/lib/appenders/gelf.js +++ b/lib/appenders/gelf.js @@ -114,9 +114,9 @@ function gelfAppender (layout, host, port, hostname, facility) { } function sendPacket(packet) { - try { - client.send(packet, 0, packet.length, port, host); - } catch(e) {} + client.send(packet, 0, packet.length, port, host, function(err) { + debug(err); + }); } return function(loggingEvent) { From 03c490fbf1e1b565d606439432874b3551a262b9 Mon Sep 17 00:00:00 2001 From: Did Date: Mon, 20 Jun 2016 10:19:56 +0200 Subject: [PATCH 2/6] Update gelf.js --- lib/appenders/gelf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/appenders/gelf.js b/lib/appenders/gelf.js index 508bfbf..a367ef5 100644 --- a/lib/appenders/gelf.js +++ b/lib/appenders/gelf.js @@ -115,7 +115,7 @@ function gelfAppender (layout, host, port, hostname, facility) { function sendPacket(packet) { client.send(packet, 0, packet.length, port, host, function(err) { - debug(err); + if (err) { console.error(err); } }); } From b55eb70d03f00763cb11bcc3febfc09f119a6795 Mon Sep 17 00:00:00 2001 From: Abrar Ahmed Date: Mon, 11 Jul 2016 15:02:07 -0700 Subject: [PATCH 3/6] add req.url so that connect works with restify --- lib/connect-logger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/connect-logger.js b/lib/connect-logger.js index a4a1281..fc543e9 100755 --- a/lib/connect-logger.js +++ b/lib/connect-logger.js @@ -128,7 +128,7 @@ function assemble_tokens(req, res, custom_tokens) { }; var default_tokens = []; - default_tokens.push({ token: ':url', replacement: req.originalUrl }); + default_tokens.push({ token: ':url', replacement: req.originalUrl || req.url }); default_tokens.push({ token: ':protocol', replacement: req.protocol }); default_tokens.push({ token: ':hostname', replacement: req.hostname }); default_tokens.push({ token: ':method', replacement: req.method }); From bcc3d4630ff2e287e22eac1a19ea18e21b5398fd Mon Sep 17 00:00:00 2001 From: Abrar Ahmed Date: Mon, 11 Jul 2016 16:01:21 -0700 Subject: [PATCH 4/6] add req.url so that connect works with restify --- lib/connect-logger.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/connect-logger.js b/lib/connect-logger.js index fc543e9..493266d 100755 --- a/lib/connect-logger.js +++ b/lib/connect-logger.js @@ -128,7 +128,7 @@ function assemble_tokens(req, res, custom_tokens) { }; var default_tokens = []; - default_tokens.push({ token: ':url', replacement: req.originalUrl || req.url }); + default_tokens.push({ token: ':url', replacement: getUrl(req) }); default_tokens.push({ token: ':protocol', replacement: req.protocol }); default_tokens.push({ token: ':hostname', replacement: req.hostname }); default_tokens.push({ token: ':method', replacement: req.method }); @@ -177,6 +177,18 @@ function assemble_tokens(req, res, custom_tokens) { return array_unique_tokens(custom_tokens.concat(default_tokens)); } +/** + * Return request url path, + * adding this function prevents the Cyclomatic Complexity for the assemble_tokens function at low, to pass the tests. + * + * @param {IncomingMessage} req + * @return {String} + * @api private + */ + +function getUrl(req){ + return req.originalUrl || req.url +} /** * Return formatted log line. * From 552a7177bcae17807f4761930a819fedf4d6dc52 Mon Sep 17 00:00:00 2001 From: Abrar Ahmed Date: Mon, 11 Jul 2016 16:06:00 -0700 Subject: [PATCH 5/6] add req.url so that connect works with restify --- lib/connect-logger.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/connect-logger.js b/lib/connect-logger.js index 493266d..2bded77 100755 --- a/lib/connect-logger.js +++ b/lib/connect-logger.js @@ -179,7 +179,8 @@ function assemble_tokens(req, res, custom_tokens) { /** * Return request url path, - * adding this function prevents the Cyclomatic Complexity for the assemble_tokens function at low, to pass the tests. + * adding this function prevents the Cyclomatic Complexity, + * for the assemble_tokens function at low, to pass the tests. * * @param {IncomingMessage} req * @return {String} @@ -187,7 +188,7 @@ function assemble_tokens(req, res, custom_tokens) { */ function getUrl(req){ - return req.originalUrl || req.url + return req.originalUrl || req.url; } /** * Return formatted log line. From 6c21e4acd90047525d34ac4f4740e8ee0dba3bc2 Mon Sep 17 00:00:00 2001 From: Gareth Jones Date: Sun, 17 Jul 2016 20:51:18 +1000 Subject: [PATCH 6/6] 0.6.38 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 320be24..202a9b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "log4js", - "version": "0.6.37", + "version": "0.6.38", "description": "Port of Log4js to work with node.", "keywords": [ "logging",