openstack/swift
Code Issues Proposed changes

add more gettext calls

Browse Source
This commit is contained in:
Michael Barton 2010-12-20 22:10:58 +00:00
parent affc53bc1d
commit 0b3fac8992
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
swift/proxy/server.py
View File

@ -172,10 +172,11 @@ class SegmentedIterable(object):
raise raise
except Exception, err: except Exception, err:
if not getattr(err, 'swift_logged', False): if not getattr(err, 'swift_logged', False):
self.controller.app.logger.exception('ERROR: While processing ' self.controller.app.logger.exception(_('ERROR: While '
'manifest /%s/%s/%s %s' % (self.controller.account_name, 'processing manifest /%(acc)s/%(cont)s/%(obj)s'),
self.controller.container_name, {'acc': self.controller.account_name,
self.controller.object_name, self.controller.trans_id)) 'cont': self.controller.container_name,
'obj': self.controller.object_name})
err.swift_logged = True err.swift_logged = True
self.response.status_int = 503 self.response.status_int = 503
raise raise
@ -204,10 +205,11 @@ class SegmentedIterable(object):
raise raise
except Exception, err: except Exception, err:
if not getattr(err, 'swift_logged', False): if not getattr(err, 'swift_logged', False):
self.controller.app.logger.exception('ERROR: While processing ' self.controller.app.logger.exception(_('ERROR: While '
'manifest /%s/%s/%s %s' % (self.controller.account_name, 'processing manifest /%(acc)s/%(cont)s/%(obj)s'),
self.controller.container_name, {'acc': self.controller.account_name,
self.controller.object_name, self.controller.trans_id)) 'cont': self.controller.container_name,
'obj': self.controller.object_name})
err.swift_logged = True err.swift_logged = True
self.response.status_int = 503 self.response.status_int = 503
raise raise
@ -250,10 +252,11 @@ class SegmentedIterable(object):
raise raise
except Exception, err: except Exception, err:
if not getattr(err, 'swift_logged', False): if not getattr(err, 'swift_logged', False):
self.controller.app.logger.exception('ERROR: While processing ' self.controller.app.logger.exception(_('ERROR: While '
'manifest /%s/%s/%s %s' % (self.controller.account_name, 'processing manifest /%(acc)s/%(cont)s/%(obj)s'),
self.controller.container_name, {'acc': self.controller.account_name,
self.controller.object_name, self.controller.trans_id)) 'cont': self.controller.container_name,
'obj': self.controller.object_name})
err.swift_logged = True err.swift_logged = True
self.response.status_int = 503 self.response.status_int = 503
raise raise