openstack/swift
Code Issues Proposed changes

Merge "Remove some useless swob.Request attr setting"

Browse Source
This commit is contained in:
Zuul 2020-09-10 03:11:36 +00:00 committed by Gerrit Code Review
commit 3f0e9490a6
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/middleware/tempauth.py
View File

@ -666,8 +666,6 @@ class TempAuth(object):
req = Request(env) req = Request(env)
if self.auth_prefix: if self.auth_prefix:
req.path_info_pop() req.path_info_pop()
req.bytes_transferred = '-'
req.client_disconnect = False
if 'x-storage-token' in req.headers and \ if 'x-storage-token' in req.headers and \
'x-auth-token' not in req.headers: 'x-auth-token' not in req.headers:
req.headers['x-auth-token'] = req.headers['x-storage-token'] req.headers['x-auth-token'] = req.headers['x-storage-token']

4
swift/proxy/controllers/obj.py
View File

@ -931,7 +931,6 @@ class ReplicatedObjectController(BaseObjectController):
ml = req.message_length() ml = req.message_length()
if ml and bytes_transferred < ml: if ml and bytes_transferred < ml:
req.client_disconnect = True
self.app.logger.warning( self.app.logger.warning(
_('Client disconnected without sending enough data')) _('Client disconnected without sending enough data'))
self.app.logger.increment('client_disconnects') self.app.logger.increment('client_disconnects')
@ -954,7 +953,6 @@ class ReplicatedObjectController(BaseObjectController):
except HTTPException: except HTTPException:
raise raise
except ChunkReadError: except ChunkReadError:
req.client_disconnect = True
self.app.logger.warning( self.app.logger.warning(
_('Client disconnected without sending last chunk')) _('Client disconnected without sending last chunk'))
self.app.logger.increment('client_disconnects') self.app.logger.increment('client_disconnects')
@ -3228,7 +3226,6 @@ class ECObjectController(BaseObjectController):
ml = req.message_length() ml = req.message_length()
if ml and bytes_transferred < ml: if ml and bytes_transferred < ml:
req.client_disconnect = True
self.app.logger.warning( self.app.logger.warning(
_('Client disconnected without sending enough data')) _('Client disconnected without sending enough data'))
self.app.logger.increment('client_disconnects') self.app.logger.increment('client_disconnects')
@ -3304,7 +3301,6 @@ class ECObjectController(BaseObjectController):
self.app.logger.increment('client_timeouts') self.app.logger.increment('client_timeouts')
raise HTTPRequestTimeout(request=req) raise HTTPRequestTimeout(request=req)
except ChunkReadError: except ChunkReadError:
req.client_disconnect = True
self.app.logger.warning( self.app.logger.warning(
_('Client disconnected without sending last chunk')) _('Client disconnected without sending last chunk'))
self.app.logger.increment('client_disconnects') self.app.logger.increment('client_disconnects')