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.

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

add back verbose logging #311

Merged
merged 4 commits into from
Jun 15, 2017
Merged
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/queue.js
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@ Queue.prototype._maybeLog = function(item) {
}

message = _.get(item, 'data.body.message.body');
if (messagge) {
if (message) {
this.logger.log(message);
}
};
84 changes: 66 additions & 18 deletions test/queue.test.js
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ function TestApiGenerator() {
};

TestApi.prototype.configure = function() {};

return TestApi;
}

@@ -85,7 +85,7 @@ describe('configure', function() {
var logger = new (TestLoggerGenerator())();
var options = {a: 1, b: 42};
var queue = new Queue(rateLimiter, api, logger, options);

expect(queue.options.a).to.eql(1);
expect(queue.options.b).to.eql(42);

@@ -108,7 +108,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -129,7 +129,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -150,7 +150,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -173,7 +173,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {verbose: true};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {data: {body: {trace: {exception: {message: 'hello'}}}}};
var serverResponse = {success: true};

@@ -191,13 +191,61 @@ describe('addItem', function() {
done(err);
});
});
it('should call the logger if a message is about to be logged', function(done) {
var rateLimiter = new (TestRateLimiterGenerator())();
var api = new (TestApiGenerator())();
var logger = new (TestLoggerGenerator())();
var options = {verbose: true};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {data: {body: {message: {body: 'hello'}}}};
var serverResponse = {success: true};

rateLimiter.handler = function(i) {
expect(i).to.eql(item);
return {error: null, shouldSend: true, payload: null};
};
api.handler = function(i, cb) {
expect(i).to.eql(item);
cb(null, serverResponse);
};
queue.addItem(item, function(err, resp) {
expect(resp).to.eql(serverResponse);
expect(logger.calls.log[0][0]).to.eql('hello');
done(err);
});
});
it('should not call the logger if verbose is false', function(done) {
var rateLimiter = new (TestRateLimiterGenerator())();
var api = new (TestApiGenerator())();
var logger = new (TestLoggerGenerator())();
var options = {verbose: false};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {data: {body: {message: {body: 'hello'}}}};
var serverResponse = {success: true};

rateLimiter.handler = function(i) {
expect(i).to.eql(item);
return {error: null, shouldSend: true, payload: null};
};
api.handler = function(i, cb) {
expect(i).to.eql(item);
cb(null, serverResponse);
};
queue.addItem(item, function(err, resp) {
expect(resp).to.eql(serverResponse);
expect(logger.calls.log.length).to.eql(0);
done(err);
});
});
it('should stop if a predicate returns false', function(done) {
var rateLimiter = new (TestRateLimiterGenerator())();
var api = new (TestApiGenerator())();
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -223,7 +271,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -251,7 +299,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -283,7 +331,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -311,7 +359,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -333,7 +381,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};

@@ -363,7 +411,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var exception = 'boom!';

@@ -391,7 +439,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {retryInterval: 1};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var apiError = {code: 'NOPE', message: 'borked'};

@@ -413,7 +461,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var apiError = {code: 'ENOTFOUND', message: 'No internet connection'};

@@ -435,7 +483,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {retryInterval: 1};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var serverResponse = {success: true};
var apiError = {code: 'ENOTFOUND', message: 'No internet connection'};
@@ -468,7 +516,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var rateLimitError = 'bork';

@@ -496,7 +544,7 @@ describe('addItem', function() {
var logger = new (TestLoggerGenerator())();
var options = {};
var queue = new Queue(rateLimiter, api, logger, options);

var item = {mykey: 'myvalue'};
var rateLimitPayload = {something: 'went wrong'};
var serverResponse = {message: 'good times'};