openstack
/
swift
Code Issues Proposed changes

Merge "Save extra request with staticweb when possible"

This commit is contained in:
Jenkins 2012-01-03 20:04:39 +00:00 committed by Gerrit Code Review
parent 29e703327c 2c6ba9cc3d
commit 174c714ce8
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/staticweb.py
View File

@ -402,7 +402,9 @@ class StaticWeb(object):
resp = self.app(tmp_env, self._start_response)
status_int = self._get_status_int()
if status_int // 100 in (2, 3):
return self.app(env, start_response)
start_response(self._response_status, self._response_headers,
self._response_exc_info)
return resp
if status_int != 404:
return self._error_response(resp, env, start_response)
self._get_container_info(env, start_response)

18
test/unit/common/middleware/test_staticweb.py
View File

@ -56,9 +56,11 @@ class FakeMemcache(object):
class FakeApp(object):
def __init__(self, status_headers_body_iter=None):
self.calls = 0
self.get_c4_called = False
def __call__(self, env, start_response):
self.calls += 1
if env['PATH_INFO'] == '/':
return Response(status='404 Not Found')(env, start_response)
elif env['PATH_INFO'] == '/v1':
@ -129,7 +131,9 @@ class FakeApp(object):
'x-container-meta-web-listings': 't',
'x-container-meta-web-listings-css': 'listing.css'})
elif env['PATH_INFO'] == '/v1/a/c4/one.txt':
return Response(status='200 Ok', body='1')(env, start_response)
return Response(status='200 Ok',
headers={'x-object-meta-test': 'value'},
body='1')(env, start_response)
elif env['PATH_INFO'] == '/v1/a/c4/two.txt':
return Response(status='503 Service Unavailable')(env,
start_response)
@ -295,7 +299,8 @@ class FakeApp(object):
class TestStaticWeb(unittest.TestCase):
def setUp(self):
self.test_staticweb = staticweb.filter_factory({})(FakeApp())
self.app = FakeApp()
self.test_staticweb = staticweb.filter_factory({})(self.app)
def test_app_set(self):
app = FakeApp()
@ -505,6 +510,15 @@ class TestStaticWeb(unittest.TestCase):
resp = Request.blank('/v1/a/c7/').get_response(self.test_staticweb)
self.assertEquals(resp.status_int, 404)
def test_subrequest_once_if_possible(self):
resp = Request.blank(
'/v1/a/c4/one.txt').get_response(self.test_staticweb)
self.assertEquals(resp.status_int, 200)
self.assertEquals(resp.headers['x-object-meta-test'], 'value')
self.assertEquals(resp.body, '1')
self.assertEquals(self.app.calls, 1)
if __name__ == '__main__':
unittest.main()