Merge lp:~notmyname/swift/stats_fix into lp:~hudson-openstack/swift/trunk

[John Dickinson]

fixed bug in internal proxy

fixed bug in internal proxy

[lp:~notmyname/swift/stats_fix]

120. By John Dickinson on 2010-11-05

merged with clayg's branch

[clayg (clay-gerrard)]

this looks good, thanks for adding the test

review: Approve

=== modified file 'swift/stats/log_processor.py'
--- swift/stats/log_processor.py	2010-10-08 22:20:43 +0000
+++ swift/stats/log_processor.py	2010-11-05 14:44:52 +0000
@@ -73,8 +73,7 @@
             self._internal_proxy = InternalProxy(proxy_server_conf,
                                                  self.logger,
                                                  retries=3)
-        else:
-            return self._internal_proxy
+        return self._internal_proxy
 
     def process_one_file(self, plugin_name, account, container, object_name):
         self.logger.info('Processing %s/%s/%s with plugin "%s"' % (account,

=== modified file 'test/unit/stats/test_log_processor.py'
--- test/unit/stats/test_log_processor.py	2010-10-08 22:20:43 +0000
+++ test/unit/stats/test_log_processor.py	2010-11-05 14:44:52 +0000
@@ -14,9 +14,30 @@
 # limitations under the License.
 
 import unittest
+import os
+from contextlib import contextmanager
+from tempfile import NamedTemporaryFile
 
+from swift.common import internal_proxy
 from swift.stats import log_processor
 
+
+@contextmanager
+def tmpfile(content):
+    with NamedTemporaryFile('w', delete=False) as f:
+        file_name = f.name
+        f.write(str(content))
+    try:
+        yield file_name
+    finally:
+        os.unlink(file_name)
+
+
+class FakeUploadApp(object):
+    def __init__(self, *args, **kwargs):
+        pass
+
+
 class DumbLogger(object):
     def __getattr__(self, n):
         return self.foo
@@ -63,6 +84,27 @@
                     }
                    }
 
+    def test_lazy_load_internal_proxy(self):
+        # stub out internal_proxy's upload_app
+        internal_proxy.BaseApplication = FakeUploadApp
+        dummy_proxy_config = """[app:proxy-server]
+use = egg:swift#proxy
+"""
+        with tmpfile(dummy_proxy_config) as proxy_config_file:
+            conf = {'log-processor': {
+                    'proxy_server_conf': proxy_config_file,
+                }
+            }
+            p = log_processor.LogProcessor(conf, DumbLogger())
+            self.assert_(isinstance(p._internal_proxy,
+                                    None.__class__))
+            self.assert_(isinstance(p.internal_proxy,
+                                    log_processor.InternalProxy))
+            self.assertEquals(p.internal_proxy, p._internal_proxy)
+
+        # reset FakeUploadApp
+        reload(internal_proxy)
+
     def test_access_log_line_parser(self):
         access_proxy_config = self.proxy_config.copy()
         access_proxy_config.update({