openstack/swift
Code Issues Proposed changes

Merge "Log correct status code for conditional requests"

Browse Source
This commit is contained in:
Jenkins
2017-03-09 21:54:50 +00:00
committed by Gerrit Code Review
parent 3cabafa326 4ccf75fc35
commit 4c236f0303
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
swift/obj/server.py
View File

@@ -1113,6 +1113,7 @@ class ObjectController(BaseStorageServer):
' %(path)s '), {'method': req.method, 'path': req.path}) ' %(path)s '), {'method': req.method, 'path': req.path})
res = HTTPInternalServerError(body=traceback.format_exc()) res = HTTPInternalServerError(body=traceback.format_exc())
trans_time = time.time() - start_time trans_time = time.time() - start_time
res.fix_conditional_response()
if self.log_requests: if self.log_requests:
log_line = get_log_line(req, res, trans_time, '') log_line = get_log_line(req, res, trans_time, '')
if req.method in ('REPLICATE', 'SSYNC') or \ if req.method in ('REPLICATE', 'SSYNC') or \

5
test/unit/obj/test_server.py
View File

@@ -2862,6 +2862,9 @@ class TestObjectController(unittest.TestCase):
headers={'If-Match': '"11111111111111111111111111111111"'}) headers={'If-Match': '"11111111111111111111111111111111"'})
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 412) self.assertEqual(resp.status_int, 412)
self.assertIn(
'"GET /sda1/p/a/c/o" 412 - ',
self.object_controller.logger.get_lines_for_level('info')[-1])
req = Request.blank( req = Request.blank(
'/sda1/p/a/c/o', environ={'REQUEST_METHOD': 'GET'}, '/sda1/p/a/c/o', environ={'REQUEST_METHOD': 'GET'},
@@ -6445,7 +6448,7 @@ class TestObjectController(unittest.TestCase):
self.assertEqual( self.assertEqual(
self.logger.get_lines_for_level('info'), self.logger.get_lines_for_level('info'),
['None - - [01/Jan/1970:02:46:41 +0000] "PUT' ['None - - [01/Jan/1970:02:46:41 +0000] "PUT'
' /sda1/p/a/c/o" 405 - "-" "-" "-" 1.0000 "-"' ' /sda1/p/a/c/o" 405 91 "-" "-" "-" 1.0000 "-"'
' 1234 -']) ' 1234 -'])
def test_call_incorrect_replication_method(self): def test_call_incorrect_replication_method(self):