From baf0dd3feaa6313364187e20c63bb4341c645fd3 Mon Sep 17 00:00:00 2001 From: TJ Garlick Date: Fri, 18 Sep 2020 17:15:41 +0000 Subject: [PATCH 1/4] v0.2.2 --- graylog.js | 9 +++- package-lock.json | 132 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 package-lock.json diff --git a/graylog.js b/graylog.js index 15229bc..f3fc11f 100644 --- a/graylog.js +++ b/graylog.js @@ -166,8 +166,13 @@ graylog.prototype._log = function log(short_message, full_message, additionalFie delete message._id; } - // Compression - payload = new Buffer(JSON.stringify(message)); + payload = message; + try { + // Compression + payload = new Buffer(JSON.stringify(message)); + } catch { } + + function sendPayload(err, buffer) { if (err) { diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..02ab506 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,132 @@ +{ + "name": "graylog2", + "version": "0.2.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "cli": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/cli/-/cli-0.4.3.tgz", + "integrity": "sha1-5oGcjV+qlX9k+Y9mqFBiaMHR8X0=", + "dev": true, + "requires": { + "glob": ">= 3.1.4" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "jshint": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-0.9.1.tgz", + "integrity": "sha1-/zLsfwn4QAH3SY7q/WPJ5Puy3A4=", + "dev": true, + "requires": { + "cli": "0.4.3", + "minimatch": "0.0.x" + } + }, + "lru-cache": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz", + "integrity": "sha1-qlD5cEdCKsclQ72hd6nJ0BjZhFI=", + "dev": true + }, + "minimatch": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz", + "integrity": "sha1-lrtJC707poNrv6wRGt91MBsVhN4=", + "dev": true, + "requires": { + "lru-cache": "~1.0.2" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } +} diff --git a/package.json b/package.json index 51f4a96..5c7b0a7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "graylog2", "description": "Graylog2 client library for node.js", - "version": "0.2.1", + "version": "0.2.2", "author": "Marc Trudel-Belise", "bugs": { "url": "http://github.com/Wizcorp/node-graylog2/issues" From 8c423c7a0cfc3c09f232b15197856a0db7e191e2 Mon Sep 17 00:00:00 2001 From: TJ Garlick Date: Fri, 18 Sep 2020 17:32:15 +0000 Subject: [PATCH 2/4] toString --- graylog.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/graylog.js b/graylog.js index f3fc11f..64c04e3 100644 --- a/graylog.js +++ b/graylog.js @@ -166,11 +166,12 @@ graylog.prototype._log = function log(short_message, full_message, additionalFie delete message._id; } - payload = message; try { // Compression payload = new Buffer(JSON.stringify(message)); - } catch { } + } catch { + payload = message.toString() + } From 46706c82c4225a6d41921561b7d2c669784309a0 Mon Sep 17 00:00:00 2001 From: TJ Garlick Date: Fri, 18 Sep 2020 17:36:35 +0000 Subject: [PATCH 3/4] JSON stringify catch --- graylog.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/graylog.js b/graylog.js index 64c04e3..3f11932 100644 --- a/graylog.js +++ b/graylog.js @@ -152,7 +152,11 @@ graylog.prototype._log = function log(short_message, full_message, additionalFie additionalFields = full_message || additionalFields; } else { - message.full_message = message.short_message = JSON.stringify(short_message); + try { + message.full_message = message.short_message = JSON.stringify(short_message) + } catch { + message.full_message = message.short_message + } } // We insert additional fields From 1ab705b5fecc462700390ae7d68eb5f340be2a05 Mon Sep 17 00:00:00 2001 From: Tyler Garlick Date: Fri, 18 Sep 2020 19:34:49 +0000 Subject: [PATCH 4/4] v0.2.2 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 02ab506..8f8e752 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "graylog2", - "version": "0.2.1", + "version": "0.2.2", "lockfileVersion": 1, "requires": true, "dependencies": {