x/stacktach-winchester
Code Issues Proposed changes

Merge "Stringify .verified dates before json conversion."

Browse Source
This commit is contained in:
Jenkins 2015-03-12 15:51:53 +00:00 committed by Gerrit Code Review
commit 8b653622a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winchester/pipeline_handler.py
View File

@ -369,10 +369,10 @@ class UsageHandler(PipelineHandlerBase):
apb, ape = self._get_audit_period(exists) apb, ape = self._get_audit_period(exists)
return { return {
'payload': { 'payload': {
'audit_period_beginning': apb, 'audit_period_beginning': str(apb),
'audit_period_ending': ape, 'audit_period_ending': str(ape),
'launched_at': exists.get('launched_at', ''), 'launched_at': str(exists.get('launched_at', '')),
'deleted_at': exists.get('deleted_at', ''), 'deleted_at': str(exists.get('deleted_at', '')),
'instance_id': exists.get('instance_id', ''), 'instance_id': exists.get('instance_id', ''),
'tenant_id': exists.get('tenant_id', ''), 'tenant_id': exists.get('tenant_id', ''),
'display_name': exists.get('display_name', ''), 'display_name': exists.get('display_name', ''),
@ -431,8 +431,8 @@ class UsageHandler(PipelineHandlerBase):
new_event = self._base_notification(exists) new_event = self._base_notification(exists)
new_event.update({'event_type': event_type, new_event.update({'event_type': event_type,
'message_id': str(uuid.uuid4()), 'message_id': str(uuid.uuid4()),
'timestamp': exists.get('timestamp', 'timestamp': str(exists.get('timestamp',
datetime.datetime.utcnow()), datetime.datetime.utcnow())),
'stream_id': int(self.stream_id), 'stream_id': int(self.stream_id),
'error': str(error), 'error': str(error),
'error_code': error and error.code}) 'error_code': error and error.code})