Skip to content

Logging adjustments #2

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

Merged
dbrockman merged 4 commits into from
Feb 9, 2015
Merged

Logging adjustments #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f7c422
Removed unnecessary logger.debug and logger.trace
Feb 7, 2015
8283ed7
Updated error-factory to 1.2.0
Feb 7, 2015
dd5a4d3
Generated project files using Yeoman
Feb 9, 2015
972559f
Run tests in Node 0.12
Feb 9, 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
2 changes: 2 additions & 0 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
test/**
test-util/**
9 changes: 9 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: node_js
node_js:
- "0.10"
Copy link
Contributor

@dbrockman dbrockman Feb 9, 2015

Choose a reason for hiding this comment

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

  • Add - "0.12" to also run tests in node version 0.12

Copy link
Contributor

@dbrockman dbrockman Feb 9, 2015

Choose a reason for hiding this comment

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

I updated the generator to include 0.12 Springworks/generator-springworks#4

- "0.12"
script:
- npm run lint
- npm test
after_success:
- npm run coveralls
7 changes: 7 additions & 0 deletions .yo-rc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"generator-springworks": {
"projectName": "sqs processor",
"projectDescription": "Module for SQS queue processing ",
"privateProject": false
}
}
21 changes: 21 additions & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015 Springworks

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 4 additions & 4 deletions lib/message-capture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ exports.create = function(message_queue, message_processing, logger) {
* @param {Function} callback Invoked with [err].
*/
function receiveMessageBatch(queue_name, callback) {
logger.debug('receiveMessageBatch for %s', queue_name);

message_queue.receiveQueueMessages(queue_name, function(err, sqs_messages) {
var message_count;

if (err) {
logger.warn(err, 'Error receiving messages for queue %s:', queue_name);
err.payload = {
queue_name: queue_name
};
logger.warn(err, 'Error receiving messages for queue %s', queue_name);
callback(err);
return;
}
Expand All @@ -46,7 +47,6 @@ exports.create = function(message_queue, message_processing, logger) {
return;
}

// Send messages to data store API
message_processing.processMessages(sqs_messages, queue_name, function() {
logger.info(logPayload({
queue: queue_name,
Expand Down
7 changes: 1 addition & 6 deletions lib/processing/message-processing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,15 @@ exports.create = function(iterator, message_queue, logger) {
return;
}

if (!sqs_message || !sqs_message.ReceiptHandle) {
if (!sqs_message || !sqs_message.ReceiptHandle) {
logger.warn(logPayloadForSQSMessage(sqs_message),
'Missing sqs_message or sqs_message.ReceiptHandle');
callback(); // Don't provide error, since that would make async stop processing entire batch
return;
}

logger.trace('handleProcessedMessage in queue %s, handle %s',
queue_name,
sqs_message.ReceiptHandle);

// Remove stored message from queue
message_queue.deleteMessage(queue_name, sqs_message.ReceiptHandle, function(err) {
logger.trace(err, 'deleteMessage done');
if (err) {
logger.warn(logPayloadForSQSMessage(sqs_message, err), 'Error deleting message');
}
Expand Down
3 changes: 0 additions & 3 deletions lib/queue/message-queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ exports.create = function(sqs_handler, logger) {
function receiveQueueMessages(queue_name, callback) {
var queue_url_params = sqs_handler.getQueueUrlParams(queue_name);

logger.debug('receiveQueueMessages, %s:', queue_name);

// Get queue URL first and then load messages
sqs_handler.getQueueUrl(queue_url_params, function(err, queue_url) {
if (err) {
Expand All @@ -47,7 +45,6 @@ exports.create = function(sqs_handler, logger) {
}
else {
// No messages returned; not an error, but just an empty batch
logger.debug(data, 'No messages in SQS response');
callback(null, []);
}
});
Expand Down
1 change: 0 additions & 1 deletion lib/queue/sqs-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports.create = function(aws_sqs, config, logger) {
*/
function receiveMessageBatch(queue_url, callback) {
var params;
logger.debug('receiveMessageBatch: %s', queue_url);
params = getReceiveMessageParams(queue_url);
aws_sqs.receiveMessage(params, callback);
}
Expand Down
10 changes: 5 additions & 5 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"async": "^0.9.0",
"aws-sdk": "^2.0.25",
"error-factory": "https://github.com/Springworks/node-error-factory/archive/v0.3.0.tar.gz",
"error-factory": "https://github.com/Springworks/node-error-factory/archive/v1.2.0.tar.gz",
"input-validator": "https://github.com/Springworks/node-input-validator/archive/v0.5.0.tar.gz"
},
"devDependencies": {
Expand Down
17 changes: 4 additions & 13 deletions test/unit/message-capture-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ describe('unit/message-capture-test.js', function() {
message_capture.receiveMessageBatch(queue_name, function(err) {
should.not.exist(err);

logger_mock.debug.should.have.callCount(1);
logger_mock.debug.should.have.been.calledWithExactly(
'receiveMessageBatch for %s',
queue_name);
logger_mock.debug.should.have.callCount(0);
logger_mock.info.should.have.callCount(2);
logger_mock.warn.should.have.callCount(0);
message_queue_mock.receiveQueueMessages.should.have.callCount(1);
Expand All @@ -67,11 +64,8 @@ describe('unit/message-capture-test.js', function() {
message_capture.receiveMessageBatch(queue_name, function(err) {
should.not.exist(err);

logger_mock.debug.should.have.callCount(1);
logger_mock.debug.should.have.callCount(0);
logger_mock.info.should.have.callCount(1);
logger_mock.debug.should.have.been.calledWithExactly(
'receiveMessageBatch for %s',
queue_name);
logger_mock.warn.should.have.callCount(0);
message_queue_mock.receiveQueueMessages.should.have.callCount(1);
message_queue_mock.receiveQueueMessages.should.have.been.calledWith(
Expand All @@ -93,15 +87,12 @@ describe('unit/message-capture-test.js', function() {
should.exist(err);
err.should.have.property('message', 'Mocked SQS err');

logger_mock.debug.should.have.callCount(1);
logger_mock.debug.should.have.been.calledWithExactly(
'receiveMessageBatch for %s',
queue_name);
logger_mock.debug.should.have.callCount(0);
logger_mock.info.should.have.callCount(0);
logger_mock.warn.should.have.callCount(1);
logger_mock.warn.should.have.been.calledWithExactly(
sqs_err,
'Error receiving messages for queue %s:',
'Error receiving messages for queue %s',
queue_name);
message_queue_mock.receiveQueueMessages.should.have.callCount(1);
message_queue_mock.receiveQueueMessages.should.have.been.calledWith(
Expand Down
4 changes: 2 additions & 2 deletions test/unit/processing/message-processing-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('unit/processing/message-processing-test.js', function() {
queue_name,
sqs_message,
function(err) {
logger_mock.trace.should.have.callCount(2);
logger_mock.trace.should.have.callCount(0);
logger_mock.warn.should.have.callCount(0);
message_queue_mock.deleteMessage.should.have.callCount(1);
done(err);
Expand Down Expand Up @@ -157,7 +157,7 @@ describe('unit/processing/message-processing-test.js', function() {
queue_name,
sqs_message,
function(err) {
logger_mock.trace.should.have.callCount(2);
logger_mock.trace.should.have.callCount(0);
logger_mock.warn.should.have.callCount(1);
logger_mock.warn.should.have.been.calledWithExactly(
sinon.match.object,
Expand Down
5 changes: 1 addition & 4 deletions test/unit/queue/message-queue-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ describe('unit/queue/message-queue-test.js', function() {
should.not.exist(err);
messages.should.eql(mocked_messages);

logger_mock.debug.should.have.callCount(1);
logger_mock.debug.should.have.been.calledWithExactly(
'receiveQueueMessages, %s:',
queue_name);
logger_mock.debug.should.have.callCount(0);
sqs_handler_mock.getQueueUrlParams.should.have.callCount(1);
sqs_handler_mock.getQueueUrlParams.should.have.been.calledWithExactly(
queue_name);
Expand Down