openstack/swift
Code Issues Proposed changes

Merge "Fix pep8 issues"

Browse Source
This commit is contained in:
Jenkins
2012-09-07 21:55:17 +00:00
committed by Gerrit Code Review
parent fc58cb2c91 cde6d597a7
commit 6643fb1473
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
swift/obj/auditor.py
View File

@@ -100,11 +100,10 @@ class AuditorWorker(object):
'errors': self.errors, 'errors': self.errors,
'passes': self.passes, 'passes': self.passes,
'quarantined': self.quarantines, 'quarantined': self.quarantines,
'bytes_processed': 'bytes_processed': self.bytes_processed,
self.bytes_processed,
'start_time': reported, 'start_time': reported,
'audit_time': time_auditing} 'audit_time': time_auditing}},
}, self.rcache, self.logger) self.rcache, self.logger)
reported = now reported = now
total_quarantines += self.quarantines total_quarantines += self.quarantines
total_errors += self.errors total_errors += self.errors
@@ -178,7 +177,8 @@ class AuditorWorker(object):
self.logger.increment('quarantines') self.logger.increment('quarantines')
self.quarantines += 1 self.quarantines += 1
self.logger.error(_('ERROR Object %(obj)s failed audit and will ' self.logger.error(_('ERROR Object %(obj)s failed audit and will '
'be quarantined: %(err)s'), {'obj': path, 'err': err}) 'be quarantined: %(err)s'),
{'obj': path, 'err': err})
object_server.quarantine_renamer( object_server.quarantine_renamer(
os.path.join(self.devices, device), path) os.path.join(self.devices, device), path)
return return
@@ -196,8 +196,8 @@ class ObjectAuditor(Daemon):
def __init__(self, conf, **options): def __init__(self, conf, **options):
self.conf = conf self.conf = conf
self.logger = get_logger(conf, log_route='object-auditor') self.logger = get_logger(conf, log_route='object-auditor')
self.conf_zero_byte_fps = int(conf.get( self.conf_zero_byte_fps = int(
'zero_byte_files_per_second', 50)) conf.get('zero_byte_files_per_second', 50))
def _sleep(self): def _sleep(self):
time.sleep(SLEEP_BETWEEN_AUDITS) time.sleep(SLEEP_BETWEEN_AUDITS)