Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

using options object and handle error inside module when handleError … #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

using options object and handle error inside module when handleError … #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions lib/statsd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var dgram = require('dgram'),

/**
* The UDP Client for StatsD
* @param options
* @object options
* @option host {String} The host to connect to default: localhost
* @option port {String|Integer} The port to connect to default: 8125
* @option prefix {String} An optional prefix to assign to each stat name sent
Expand All @@ -12,32 +12,22 @@ var dgram = require('dgram'),
* @option cacheDns {boolean} An optional option to only lookup the hostname -> ip address once
* @option mock {boolean} An optional boolean indicating this Client is a mock object, no stats are sent.
* @option global_tags {Array=} Optional tags that will be added to every metric
* @option handleErrors {boolean} An optional option to handle errors inside statsd
* @constructor
*/
var Client = function (host, port, prefix, suffix, globalize, cacheDns, mock, global_tags) {
var options = host || {},
self = this;

if(arguments.length > 1 || typeof(host) === 'string'){
options = {
host : host,
port : port,
prefix : prefix,
suffix : suffix,
globalize : globalize,
cacheDns : cacheDns,
mock : mock === true,
global_tags : global_tags
};
var Client = function (options) {
var self = this;
if (!options) {
options = {};
}

this.host = options.host || 'localhost';
this.port = options.port || 8125;
this.prefix = options.prefix || '';
this.suffix = options.suffix || '';
this.host = options.host ? options.host : 'localhost';
this.port = options.port ? options.port : 8125;
this.prefix = options.prefix ? options.prefix : '';
this.suffix = options.suffix ? options.suffix : '';
this.socket = dgram.createSocket('udp4');
this.mock = options.mock;
this.global_tags = options.global_tags || [];
this.mock = options.mock ? options.mock : false;
this.global_tags = options.global_tags ? options.global_tags : [];

if(options.cacheDns === true){
dns.lookup(options.host, function(err, address, family){
Expand All @@ -47,6 +37,13 @@ var Client = function (host, port, prefix, suffix, globalize, cacheDns, mock, gl
});
}

if (options.handleErrors === true) {
this.socket.on("error", function(err) {
console.log('\nError Handler:');
console.error(err);
});
}

if(options.globalize){
global.statsd = this;
}
Expand Down
92 changes: 58 additions & 34 deletions test/test_statsd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,16 @@ function assertMockClientMethod(method, finished){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'prefix', 'suffix', false, false,
/* mock = true */ true),
statsd = new StatsD({
host: address.address,
port: address.port,
prefix: 'prefix',
suffix: 'suffix',
globalize: false,
cacheDns: false,
mock: true,
handleErrors: false
}),
socket = dgram.createSocket("udp4"),
buf = new Buffer(testFinished),
callbackThrows = false;
Expand Down Expand Up @@ -76,20 +84,28 @@ describe('StatsD', function(){
describe('#init', function(){
it('should set default values when not specified', function(){
// cachedDns isn't tested here; see below
var statsd = new StatsD();
var statsd = new StatsD({});
assert.equal(statsd.host, 'localhost');
assert.equal(statsd.port, 8125);
assert.equal(statsd.prefix, '');
assert.equal(statsd.suffix, '');
assert.equal(global.statsd, undefined);
assert.equal(statsd.mock, undefined);
assert.equal(statsd.mock, false);
assert.deepEqual(statsd.global_tags, []);
assert.ok(!statsd.mock);
});

it('should set the proper values when specified', function(){
// cachedDns isn't tested here; see below
var statsd = new StatsD('host', 1234, 'prefix', 'suffix', true, null, true, ['gtag']);
var statsd = new StatsD({
host: 'host',
port: 1234,
prefix: 'prefix',
suffix: 'suffix',
globalize: true,
mock: true,
global_tags: ['gtag']
});
assert.equal(statsd.host, 'host');
assert.equal(statsd.port, 1234);
assert.equal(statsd.prefix, 'prefix');
Expand Down Expand Up @@ -157,19 +173,27 @@ describe('StatsD', function(){
});

it('should create a global variable set to StatsD() when specified', function(){
var statsd = new StatsD('host', 1234, 'prefix', 'suffix', true);
var statsd = new StatsD({host: 'host', port: 1234, prefix: 'prefix', suffix: 'suffix', globalize: true});
assert.ok(global.statsd instanceof StatsD);
//remove it from the namespace to not fail other tests
delete global.statsd;
});

it('should not create a global variable when not specified', function(){
var statsd = new StatsD('host', 1234, 'prefix', 'suffix');
var statsd = new StatsD({ host: 'host', port: 1234, prefix: 'prefix', suffix: 'suffix'});
assert.equal(global.statsd, undefined);
});

it('should create a mock Client when mock variable is specified', function(){
var statsd = new StatsD('host', 1234, 'prefix', 'suffix', false, false, true);
var statsd = new StatsD({
host: 'host',
port: 1234,
prefix: 'prefix',
suffix: 'suffix',
globalize: false,
cacheDns: false,
mock: true
});
assert.ok(statsd.mock);
});

Expand All @@ -188,7 +212,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.increment('test');
});
Expand Down Expand Up @@ -236,8 +260,8 @@ describe('StatsD', function(){
server.close();
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
var address = server.address();
var statsd = new StatsD({host: address.address, port: address.port});

statsd.timing('test', 42);
});
Expand All @@ -250,7 +274,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.timing('test', 42, ['foo', 'bar']);
});
Expand All @@ -265,7 +289,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.timing('test', 42, 0.5, function(){
called = true;
Expand All @@ -288,7 +312,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.timing(['a', 'b'], 42, null, function(error, bytes){
called += 1;
Expand All @@ -312,7 +336,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.histogram('test', 42);
});
Expand All @@ -325,7 +349,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.histogram('test', 42, ['foo', 'bar']);
});
Expand All @@ -340,7 +364,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.histogram('test', 42, 0.5, function(){
called = true;
Expand All @@ -363,7 +387,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.histogram(['a', 'b'], 42, null, function(error, bytes){
called += 1;
Expand All @@ -387,7 +411,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.gauge('test', 42);
});
Expand All @@ -400,7 +424,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.gauge('test', 42, ['foo', 'bar']);
});
Expand All @@ -415,7 +439,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.gauge('test', 42, 0.5, function(){
called = true;
Expand All @@ -438,7 +462,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.gauge(['a', 'b'], 42, null, function(error, bytes){
called += 1;
Expand All @@ -462,7 +486,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.increment('test');
});
Expand All @@ -475,7 +499,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.increment('test', 42, ['foo', 'bar']);
});
Expand All @@ -490,7 +514,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.increment('test', 42, 0.5, function(){
called = true;
Expand All @@ -513,7 +537,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.increment(['a', 'b'], null, function(error, bytes){
called += 1;
Expand All @@ -537,7 +561,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.decrement('test');
});
Expand All @@ -550,7 +574,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.decrement('test', 42, ['foo', 'bar']);
});
Expand All @@ -565,7 +589,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.decrement('test', 42, 0.5, function(){
called = true;
Expand All @@ -589,7 +613,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.decrement(['a', 'b'], null, function(error, bytes){
called += 1;
Expand All @@ -613,7 +637,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.set('test', 42);
});
Expand All @@ -626,7 +650,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.set('test', 42, ['foo', 'bar']);
});
Expand All @@ -641,7 +665,7 @@ describe('StatsD', function(){
finished();
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port, 'foo.', '.bar');
statsd = new StatsD({host: address.address, port: address.port, prefix: 'foo.', suffix: '.bar'});

statsd.unique('test', 42, 0.5, function(){
called = true;
Expand All @@ -664,7 +688,7 @@ describe('StatsD', function(){
}
}, function(server){
var address = server.address(),
statsd = new StatsD(address.address, address.port);
statsd = new StatsD({host: address.address, port: address.port});

statsd.unique(['a', 'b'], 42, null, function(error, bytes){
called += 1;
Expand Down