Comparing version 0.1.7 to 0.1.8
@@ -0,0 +0,0 @@ // Load modules |
@@ -17,3 +17,3 @@ // Load modules | ||
host: Os.hostname(), | ||
appVer: Hoek.loadPackage().version || 'unknown' | ||
appVer: Hoek.loadPackage(__dirname + '/..').version || 'unknown' // Look up a level to get the package.json page | ||
}; | ||
@@ -128,3 +128,4 @@ | ||
psmem: self._process.memory, | ||
pscpu: self._process.cpu | ||
pscpu: self._process.cpu, | ||
psdelay: self._process.delay | ||
}, | ||
@@ -303,2 +304,3 @@ function (err, results) { | ||
var req = request.raw.req; | ||
var res = request.raw.res; | ||
@@ -318,3 +320,4 @@ var event = { | ||
}, | ||
responseTime: Date.now() - request.analytics.startTime | ||
responseTime: Date.now() - request.analytics.startTime, | ||
statusCode: res.statusCode | ||
}; | ||
@@ -321,0 +324,0 @@ |
@@ -64,2 +64,19 @@ // Load modules | ||
callback(null, result); | ||
}; | ||
/** | ||
* Return event queue delay in ms | ||
* | ||
* @param {Function} callback function to process result | ||
* @api public | ||
*/ | ||
internals.ProcessMonitor.prototype.delay = function (callback) { | ||
var start = Date.now(); | ||
process.nextTick(function () { | ||
callback(null, Date.now() - start); | ||
}); | ||
}; |
{ | ||
"name": "good", | ||
"description": "Server and process monitoring plugin", | ||
"version": "0.1.7", | ||
"version": "0.1.8", | ||
"author": "Van Nguyen <the.gol.effect@gmail.com>", | ||
@@ -6,0 +6,0 @@ "contributors":[ |
@@ -0,0 +0,0 @@ <a href="https://github.com/spumko"><img src="https://raw.github.com/spumko/spumko/master/images/from.png" align="right" /></a> |
@@ -0,0 +0,0 @@ // Load modules |
@@ -6,2 +6,3 @@ // Load modules | ||
var Hoek = require('hoek'); | ||
var Request = require('request'); | ||
var Monitor = require('../lib/monitor'); | ||
@@ -233,2 +234,75 @@ | ||
}); | ||
it('sends all events to a remote server subscriber', function (done) { | ||
var remoteServer = new Hapi.Server(0); | ||
remoteServer.route({ method: 'POST', path: '/', handler: function (request) { | ||
expect(request.payload.appVer).to.exist; | ||
expect(request.payload.appVer).to.not.equal('unknown'); | ||
done(); | ||
}}); | ||
var options = { | ||
subscribers: {} | ||
}; | ||
remoteServer.start(function () { | ||
options.subscribers[remoteServer.settings.uri] = { events: ['log'] }; | ||
makePack(function (pack, server) { | ||
var monitor = new Monitor(pack, options); | ||
expect(monitor._eventQueues.log).to.exist; | ||
server.log('ERROR', 'included in output'); | ||
monitor._broadcast()(); | ||
}); | ||
}); | ||
}); | ||
it('sends response status code to remote subscribers', function (done) { | ||
var remoteServer = new Hapi.Server(0); | ||
var server = new Hapi.Server(0); | ||
remoteServer.route({ method: 'POST', path: '/', handler: function (request) { | ||
expect(request.payload.events[0].statusCode).to.equal(200); | ||
request.reply('Success'); | ||
done(); | ||
}}); | ||
server.route({ method: 'GET', path: '/', handler: function (request) { | ||
request.reply('Success'); | ||
}}); | ||
var options = { | ||
subscribers: {} | ||
}; | ||
remoteServer.start(function () { | ||
options.subscribers[remoteServer.settings.uri] = { events: ['request'] }; | ||
var plugin = { | ||
name: 'good', | ||
register: require('../lib/index').register, | ||
version: '0.0.1' | ||
}; | ||
server.plugin.register(plugin, options, function () { | ||
server.start(function () { | ||
Request(server.settings.uri, function () { | ||
server.plugins.good.monitor._broadcast(); | ||
}); | ||
}); | ||
}); | ||
}); | ||
}); | ||
}); | ||
@@ -341,2 +415,6 @@ | ||
cb(); | ||
}, | ||
delay: function (cb) { | ||
cb(); | ||
} | ||
@@ -402,2 +480,5 @@ }; | ||
} | ||
}, | ||
res: { | ||
} | ||
@@ -431,2 +512,5 @@ }, | ||
} | ||
}, | ||
res: { | ||
} | ||
@@ -464,2 +548,5 @@ }, | ||
} | ||
}, | ||
res: { | ||
} | ||
@@ -466,0 +553,0 @@ }, |
@@ -78,2 +78,16 @@ // Load modules | ||
}); | ||
describe('#delay', function () { | ||
it('passes the current event queue delay to the callback', function (done) { | ||
var monitor = new ProcessMonitor.Monitor(); | ||
monitor.delay(function (err, delay) { | ||
expect(err).not.to.exist; | ||
expect(delay).to.exist; | ||
done(); | ||
}); | ||
}); | ||
}); | ||
}); |
@@ -0,0 +0,0 @@ // Load modules |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
97561
1178