openstack
/
zaqar
Code Issues Proposed changes

Merge "Fix message claim expires problem in swift storage"

This commit is contained in:
Jenkins 2017-07-20 10:09:04 +00:00 committed by Gerrit Code Review
parent d085bbcd5e 1b0bf4e735
commit c3098dace4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zaqar/storage/swift/messages.py
View File

@ -121,9 +121,11 @@ class MessageController(storage.Message):
raise
def is_claimed(msg, headers):
if include_claimed:
if include_claimed or msg['claim_id'] is None:
return False
return msg['claim_id'] is not None
claim_obj = self.driver.claim_controller._get(
queue, msg['claim_id'], project)
return claim_obj is not None and claim_obj['ttl'] > 0
def is_echo(msg, headers):
if echo: