fluent-logger - npm Package Compare versions

Comparing version 2.1.0 to 2.2.0

lib/logger-error.js

@@ -30,6 +30,12 @@ 'use strict';
 
+var DataTypeError = function DataTypeError(message, options) {
+  DataTypeError.super_.call(this, message, options);
+};
+util.inherits(DataTypeError, BaseError);
+
 module.exports = {
   MissingTag: MissingTagError,
   ResponseError: ResponseError,
+  DataTypeError: DataTypeError,
   ResponseTimeout: ResponseTimeoutError
 };

lib/sender.js

@@ -48,8 +48,23 @@ 'use strict';
 
+  var error;
+  var options;
   if (item.tag === null) {
-    var error = new FluentLoggerError.MissingTag('tag is missing',
-                                                 { tag_prefix: self.tag_prefix, label: label });
+    options = {
+      tag_prefix: self.tag_prefix,
+      label: label
+    };
+    error = new FluentLoggerError.MissingTag('tag is missing', options);
     self._handleError(error, 'error', callback);
     return;
   }
+  if (typeof item.data !== "object") {
+    options = {
+      tag_prefix: self.tag_prefix,
+      label: label,
+      record: item.data
+    };
+    error = new FluentLoggerError.DataTypeError('data must be an object', options);
+    self._handleError(error, 'error', callback);
+    return;
+  }
 
@@ -109,3 +124,3 @@ item.callback = callback;
 
-  if (typeof time != "number") {
+  if (typeof time !== "number") {
     time = Math.floor((time ? time.getTime() : Date.now()) / this._timeResolution);
@@ -255,3 +270,3 @@ }
       }
-      self.emit(label, dataString, function(err) {
+      self.emit(label, { message: dataString }, function(err) {
         if (err) {
@@ -258,0 +273,0 @@ return self._handleError(err, 'error', callback);

package.json

 {
   "name": "fluent-logger",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "main": "./lib/index.js",
@@ -5,0 +5,0 @@ "scripts": {

test/test.sender.js

@@ -17,3 +17,3 @@ var expect = require('chai').expect;
       for(var i=0; i<10; i++){
-        emit(i);
+        emit({ number: i });
       }
@@ -25,3 +25,3 @@ emits.push(function(){
             expect(data[i].tag).to.be.equal("debug.record");
-            expect(data[i].data).to.be.equal(i);
+            expect(data[i].data.number).to.be.equal(i);
           }
@@ -44,3 +44,3 @@ done();
     });
-    s.emit('test connection error', 'foobar');
+    s.emit('test connection error', { message: 'foobar' });
   });
@@ -52,12 +52,12 @@
       var s = new sender.FluentSender('debug', {port: server.port});
-      s.emit('1st record', '1st data');
-      s.emit('2nd record', '2nd data');
-      s.end('last record', 'last data', function(){
+      s.emit('1st record', { message: '1st data' });
+      s.emit('2nd record', { message: '2nd data' });
+      s.end('last record', { message: 'last data' }, function(){
         finish(function(data){
           expect(data[0].tag).to.be.equal('debug.1st record');
-          expect(data[0].data).to.be.equal('1st data');
+          expect(data[0].data.message).to.be.equal('1st data');
           expect(data[1].tag).to.be.equal('debug.2nd record');
-          expect(data[1].data).to.be.equal('2nd data');
+          expect(data[1].data.message).to.be.equal('2nd data');
           expect(data[2].tag).to.be.equal('debug.last record');
-          expect(data[2].data).to.be.equal('last data');
+          expect(data[2].data.message).to.be.equal('last data');
           done();
@@ -75,3 +75,3 @@ });
 
-      s.emit("1st record", "1st data", timestamp, function() {
+      s.emit("1st record", { message: "1st data" }, timestamp, function() {
         finish(function(data) {
@@ -90,3 +90,3 @@ expect(data[0].time).to.be.equal(timestamp_seconds_since_epoch);
 
-      s.emit("1st record", "1st data", timestamp, function() {
+      s.emit("1st record", { message: "1st data" }, timestamp, function() {
         finish(function(data) {
@@ -102,3 +102,3 @@ expect(data[0].time).to.be.equal(timestamp);
     var s = new sender.FluentSender('debug');
-    s.emit('1st record', '1st data');
+    s.emit('1st record', { message: '1st data' });
     s.on('error', function(err){
@@ -108,11 +108,11 @@ expect(err.code).to.be.equal('ECONNREFUSED');
         s.port = server.port;
-        s.emit('2nd record', '2nd data');
-        s.end('last record', 'last data', function(){
+        s.emit('2nd record', { message: '2nd data' });
+        s.end('last record', { message: 'last data' }, function(){
           finish(function(data){
             expect(data[0].tag).to.be.equal('debug.1st record');
-            expect(data[0].data).to.be.equal('1st data');
+            expect(data[0].data.message).to.be.equal('1st data');
             expect(data[1].tag).to.be.equal('debug.2nd record');
-            expect(data[1].data).to.be.equal('2nd data');
+            expect(data[1].data.message).to.be.equal('2nd data');
             expect(data[2].tag).to.be.equal('debug.last record');
-            expect(data[2].data).to.be.equal('last data');
+            expect(data[2].data.message).to.be.equal('last data');
             done();
@@ -136,6 +136,6 @@ });
                 s.port = _server2.port;   // in actuall case, s.port does not need to be updated.
-                s.emit('bar', 'hoge', function(){
+                s.emit('bar', { message: 'hoge' }, function(){
                   finish(function(data){
                     expect(data[0].tag).to.be.equal('debug.bar');
-                    expect(data[0].data).to.be.equal('hoge');
+                    expect(data[0].data.message).to.be.equal('hoge');
                     done();
@@ -167,3 +167,3 @@ });
       for (var i=0; i<10; i++) {
-        emit(i);
+        emit({ number: i });
       }
@@ -175,3 +175,3 @@ emits.push(function(){
             expect(data[i].tag).to.be.equal("debug.record");
-            expect(data[i].data).to.be.equal(i);
+            expect(data[i].data.number).to.be.equal(i);
             expect(data[i].options.chunk).to.be.equal(server.messages[i].options.chunk);
@@ -196,3 +196,3 @@ }
       });
-      s1.emit('record', 1);
+      s1.emit('record', { number: 1 });
       finish(function(data) {
@@ -440,2 +440,16 @@ expect(data.length).to.be.equal(1);
 
+  it('should not send records is not object', function (done) {
+    runServer({}, function (server, finish) {
+      var s1 = new sender.FluentSender(null, { port: server.port });
+      s1.on('error', function (error) {
+        expect(error.name).to.be.equal('DataTypeError');
+      });
+      s1.emit('label', 'string');
+      finish(function(data) {
+        expect(data.length).to.be.equal(0);
+      });
+      done();
+    });
+  });
+
   it('should set max listeners', function(done){
@@ -459,10 +473,10 @@ var s = new sender.FluentSender('debug');
       var s = new sender.FluentSender('debug', {port: server.port});
-      s.emit('1st record', '1st data', function(){
+      s.emit('1st record', { message: '1st data' }, function(){
         s._socket.destroy();
-        s.emit('2nd record', '2nd data', function(){
+        s.emit('2nd record', { message: '2nd data' }, function(){
           finish(function(data){
             expect(data[0].tag).to.be.equal("debug.1st record");
-            expect(data[0].data).to.be.equal("1st data");
+            expect(data[0].data.message).to.be.equal("1st data");
             expect(data[1].tag).to.be.equal("debug.2nd record");
-            expect(data[1].data).to.be.equal("2nd data");
+            expect(data[1].data.message).to.be.equal("2nd data");
             done();
@@ -488,6 +502,6 @@ });
           finish(function(data) {
-            expect(data[0].data).to.be.equal('data1');
-            expect(data[1].data).to.be.equal('data2');
-            expect(data[2].data).to.be.equal('data3');
-            expect(data[3].data).to.be.equal('data4');
+            expect(data[0].data.message).to.be.equal('data1');
+            expect(data[1].data.message).to.be.equal('data2');
+            expect(data[2].data.message).to.be.equal('data3');
+            expect(data[3].data.message).to.be.equal('data4');
             done();
@@ -494,0 +508,0 @@ });

No alert changes

Improved metrics

Total package byte prevSize

53168

increased by2.42%

Lines of code

1113

increased by3.06%

No dependency changes