Merge "Iterates swift response earlier to get the correct status" into stable/icehouse

2 files changed, 14 insertions, 4 deletions

diff --git a/ceilometer/objectstore/swift_middleware.py b/ceilometer/objectstore/swift_middleware.py
index 10431840..3d75b35e 100644
--- a/ceilometer/objectstore/swift_middleware.py
+++ b/ceilometer/objectstore/swift_middleware.py
@@ -93,14 +93,22 @@ class CeilometerMiddleware(object):
             start_response_args[0] = (status, list(headers), exc_info)
 
         def iter_response(iterable):
+            iterator = iter(iterable)
+            try:
+                chunk = iterator.next()
+                while not chunk:
+                    chunk = iterator.next()
+            except StopIteration:
+                chunk = ''
+
             if start_response_args[0]:
                 start_response(*start_response_args[0])
             bytes_sent = 0
             try:
-                for chunk in iterable:
-                    if chunk:
-                        bytes_sent += len(chunk)
+                while chunk:
+                    bytes_sent += len(chunk)
                     yield chunk
+                    chunk = iterator.next()
             finally:
                 try:
                     self.publish_sample(env,
diff --git a/ceilometer/tests/objectstore/test_swift_middleware.py b/ceilometer/tests/objectstore/test_swift_middleware.py
index 7f3e0084..3a70bb11 100644
--- a/ceilometer/tests/objectstore/test_swift_middleware.py
+++ b/ceilometer/tests/objectstore/test_swift_middleware.py
@@ -34,13 +34,15 @@ class FakeApp(object):
         self.body = body
 
     def __call__(self, env, start_response):
+        yield
         start_response('200 OK', [
             ('Content-Type', 'text/plain'),
             ('Content-Length', str(sum(map(len, self.body))))
         ])
         while env['wsgi.input'].read(5):
             pass
-        return self.body
+        for line in self.body:
+            yield line
 
 
 class TestSwiftMiddleware(test.BaseTestCase):