Merge lp:~gholt/swift/late_loadapp into lp:~hudson-openstack/swift/trunk

[gholt]

Move loadapp to after-fork

[gholt (gholt)]

Don't approve until after Cactus.

[lp:~gholt/swift/late_loadapp]

265. By gholt on 2011-04-12

Put early loadapp back in, even though we won't use the result, to test for any instantiation problems early

=== modified file 'swift/common/wsgi.py'
--- swift/common/wsgi.py	2011-02-14 23:02:08 +0000
+++ swift/common/wsgi.py	2011-04-12 18:31:34 +0000
@@ -124,8 +124,8 @@
     # remaining tasks should not require elevated privileges
     drop_privileges(conf.get('user', 'swift'))
 
-    # finally after binding to ports and privilege drop, run app __init__ code
-    app = loadapp('config:%s' % conf_file, global_conf={'log_name': log_name})
+    # Ensure the application can be loaded before proceeding.
+    loadapp('config:%s' % conf_file, global_conf={'log_name': log_name})
 
     # redirect errors to logger and close stdio
     capture_stdio(logger)
@@ -135,6 +135,8 @@
         eventlet.hubs.use_hub('poll')
         eventlet.patcher.monkey_patch(all=False, socket=True)
         monkey_patch_mimetools()
+        app = loadapp('config:%s' % conf_file,
+                      global_conf={'log_name': log_name})
         pool = GreenPool(size=1024)
         try:
             wsgi.server(sock, app, NullLogger(), custom_pool=pool)