openstack/swift
Code Issues Proposed changes

Merge "Fix pep8 issues"

Browse Source
This commit is contained in:
Jenkins
2012-09-07 22:01:48 +00:00
committed by Gerrit Code Review
parent 6643fb1473 3139760218
commit aee707b78d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
swift/obj/expirer.py
View File

@@ -49,7 +49,8 @@ class ObjectExpirer(Daemon):
'expiring_objects' 'expiring_objects'
conf_path = conf.get('__file__') or '/etc/swift/object-expirer.conf' conf_path = conf.get('__file__') or '/etc/swift/object-expirer.conf'
request_tries = int(conf.get('request_tries') or 3) request_tries = int(conf.get('request_tries') or 3)
self.swift = InternalClient(conf_path, 'Swift Object Expirer', self.swift = InternalClient(conf_path,
'Swift Object Expirer',
request_tries) request_tries)
self.report_interval = int(conf.get('report_interval') or 300) self.report_interval = int(conf.get('report_interval') or 300)
self.report_first_time = self.report_last_time = time() self.report_first_time = self.report_last_time = time()
@@ -124,9 +125,9 @@ class ObjectExpirer(Daemon):
self.report() self.report()
try: try:
self.swift.delete_container( self.swift.delete_container(
self.expiring_objects_account, container, self.expiring_objects_account,
acceptable_statuses=(2, HTTP_NOT_FOUND, container,
HTTP_CONFLICT)) acceptable_statuses=(2, HTTP_NOT_FOUND, HTTP_CONFLICT))
except (Exception, Timeout), err: except (Exception, Timeout), err:
self.logger.exception( self.logger.exception(
_('Exception while deleting container %s %s') % _('Exception while deleting container %s %s') %
@@ -168,5 +169,5 @@ class ObjectExpirer(Daemon):
perform the actual delete. perform the actual delete.
""" """
self.swift.make_request('DELETE', '/v1/%s' % (quote(actual_obj),), self.swift.make_request('DELETE', '/v1/%s' % (quote(actual_obj),),
{'X-If-Delete-At': str(timestamp)}, (2, HTTP_NOT_FOUND, {'X-If-Delete-At': str(timestamp)},
HTTP_PRECONDITION_FAILED)) (2, HTTP_NOT_FOUND, HTTP_PRECONDITION_FAILED))