Skip to content

Commit

Permalink
Add initial message metadata support
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeyk committed Feb 9, 2017
1 parent 38a05a0 commit bd96115
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions loafer/ext/aws/message_translators.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ def translate(self, message):
except (KeyError, TypeError):
logger.error('missing Body key in SQS message. It really came from SQS ?'
'\nmessage={!r}'.format(message))
return {'content': None}
return {'content': None, 'metadata': {}}

try:
return {'content': json.loads(body)}
return {'content': json.loads(body), 'metadata': {}}
except json.decoder.JSONDecodeError as exc:
logger.error('error={!r} message={!r}'.format(exc, message))
return {'content': None}
return {'content': None, 'metadata': {}}


class SNSMessageTranslator:
Expand All @@ -29,10 +29,10 @@ def translate(self, message):
logger.error(
'Missing Body or Message key in SQS message. It really came from SNS ?'
'\nmessage={!r}'.format(message))
return {'content': None}
return {'content': None, 'metadata': {}}

try:
return {'content': json.loads(message)}
return {'content': json.loads(message), 'metadata': {}}
except (json.decoder.JSONDecodeError, TypeError) as exc:
logger.error('error={!r} message={!r}'.format(exc, message))
return {'content': None}
return {'content': None, 'metadata': {}}
2 changes: 1 addition & 1 deletion loafer/message_translators.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ class StringMessageTranslator:

def translate(self, message):
logger.debug('{!r} will translate {!r}'.format(type(self).__name__, message))
return {'content': str(message)}
return {'content': str(message), 'metadata': {}}
6 changes: 3 additions & 3 deletions tests/test_message_translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
def test_translate():
translator = StringMessageTranslator()
message = translator.translate(1)
assert message == {'content': '1'}
assert message == {'content': '1', 'metadata': {}}

message = translator.translate('test')
assert message == {'content': 'test'}
assert message == {'content': 'test', 'metadata': {}}

message = translator.translate(None)
assert message == {'content': 'None'}
assert message == {'content': 'None', 'metadata': {}}

0 comments on commit bd96115

Please sign in to comment.