openstack/swift
Code Issues Proposed changes

account: Remove logging translations

Browse Source 
Change-Id: I1c415ec6fcfe426f71267c2fb7d714c2d84e0014
Partial-Bug: #1674543
This commit is contained in:
Tim Burke 2021-11-29 17:19:17 -08:00
parent 8bda234e40
commit 5979b6e15f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swift/account/auditor.py
View File

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
from swift import gettext_ as _
from swift.account.backend import AccountBroker from swift.account.backend import AccountBroker
from swift.common.exceptions import InvalidAccountInfo from swift.common.exceptions import InvalidAccountInfo
from swift.common.db_auditor import DatabaseAuditor from swift.common.db_auditor import DatabaseAuditor
@ -41,7 +40,7 @@ class AccountAuditor(DatabaseAuditor):
for key in policy_totals: for key in policy_totals:
if policy_totals[key] == info[key]: if policy_totals[key] == info[key]:
continue continue
return InvalidAccountInfo(_( return InvalidAccountInfo(
'The total %(key)s for the container (%(total)s) does not ' 'The total %(key)s for the container (%(total)s) does not '
'match the sum of %(key)s across policies (%(sum)s)') 'match the sum of %(key)s across policies (%(sum)s)'
% {'key': key, 'total': info[key], 'sum': policy_totals[key]}) % {'key': key, 'total': info[key], 'sum': policy_totals[key]})

5
swift/account/server.py
View File

@ -17,7 +17,6 @@ import json
import os import os
import time import time
import traceback import traceback
from swift import gettext_ as _
from eventlet import Timeout from eventlet import Timeout
@ -325,8 +324,8 @@ class AccountController(BaseStorageServer):
except HTTPException as error_response: except HTTPException as error_response:
res = error_response res = error_response
except (Exception, Timeout): except (Exception, Timeout):
self.logger.exception(_('ERROR __call__ error with %(method)s' self.logger.exception('ERROR __call__ error with %(method)s'
' %(path)s '), ' %(path)s ',
{'method': req.method, 'path': req.path}) {'method': req.method, 'path': req.path})
res = HTTPInternalServerError(body=traceback.format_exc()) res = HTTPInternalServerError(body=traceback.format_exc())
if self.log_requests: if self.log_requests: