Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleaned up stop function #321

Merged
merged 2 commits into from
Apr 2, 2015
Merged

Cleaned up stop function #321

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f57d4
Cleaned up stop function. Closes #312
arb Apr 2, 2015
8619d2e
PR updates.
arb Apr 2, 2015
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
56 changes: 36 additions & 20 deletions lib/monitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ internals.defaults = {
};


internals.iterateOverEventHash = function (hash, predicate) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move lower so that exports appear first


var keys = Object.keys(hash);
for (var k = 0, kl = keys.length; k < kl; ++k) {
var key = keys[k];
predicate(key, hash[key]);
}
};


module.exports = internals.Monitor = function (server, options) {

options = options || {};
Expand All @@ -49,7 +59,10 @@ module.exports = internals.Monitor = function (server, options) {

this.settings = options;
this._reporters = [];
this._state = {};
this._state = {
handlers: {},
extensions: {}
};
this._server = server;

// Options used to create Great Response
Expand Down Expand Up @@ -154,28 +167,29 @@ internals.Monitor.prototype.start = function (callback) {
}

self._state.opsInterval = setInterval(setupOpsMonitoring(), self.settings.opsInterval);

self._state.logHander = self._logHandler.bind(self);
self._state.errorHandler = self._errorHandler.bind(self);
self._state.responseHandler = self._responseHandler.bind(self);
self._state.opsHandler = self._opsHandler.bind(self);
self._state.requestLogHandler = self._requestLogHandler.bind(self);
self._state.wreckHandler = self._wreckHandler.bind(self);

self._state.handlers.log = self._logHandler.bind(self);
self._state.handlers['request-error'] = self._errorHandler.bind(self);
self._state.handlers[self.settings.responseEvent] = self._responseHandler.bind(self);
self._state.handlers.request = self._requestLogHandler.bind(self);

// Initialize Events
self._server.on('log', self._state.logHander);
self._server.on('request-error', self._state.errorHandler);
self._server.on(self.settings.responseEvent, self._state.responseHandler);
internals.iterateOverEventHash(self._state.handlers, function (event, handler) {

self._server.on(event, handler);
});

self.on('ops', self._state.opsHandler);
self._server.on('request', self._state.requestLogHandler);
Wreck.on('response', self._state.wreckHandler);

// Events can not be any of ['log', 'request-error', 'ops', 'request', 'response', 'tail']
for (var i = 0, il = self.settings.extensions.length; i < il; ++i) {
var event = self.settings.extensions[i];

self._state[event] = self._extensionHandler.bind(self, event);
self._server.on(self.settings.extensions[i], self._state[event]);
self._state.extensions[event] = self._extensionHandler.bind(self, event);
self._server.on(self.settings.extensions[i], self._state.extensions[event]);
}

return callback();
Expand All @@ -185,20 +199,22 @@ internals.Monitor.prototype.start = function (callback) {

internals.Monitor.prototype.stop = function () {

var self = this;
var state = this._state;
clearInterval(state.opsInterval);

this._server.removeListener('log', state.logHander);
this._server.removeListener('request-error', state.errorHandler);
this._server.removeListener(this.settings.responseEvent, state.responseHandler);
this.removeListener('ops', state.opsHandler);
this._server.removeListener('request', state.requestLogHandler);
Wreck.removeListener('response', state.wreckHandler);

for (var i = 0, il = this.settings.extensions.length; i < il; ++i) {
var event = this.settings.extensions[i];
this._server.removeListener(event, this._state[event]);
}
internals.iterateOverEventHash(state.handlers, function (event, handler) {

self._server.removeListener(event, handler);
});

internals.iterateOverEventHash(state.extensions, function (event, handler) {

self._server.removeListener(event, handler);
});

for (var j = 0, jl = this._reporters.length; j < jl; ++j) {
var reporter = this._reporters[j];
Expand Down