[imp] refactoring to improve the way the components are destroyed

[odoo/odoo.git] / addons / web / __init__.py

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index ec70229..dba47c9 100644 (file)
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -2,31 +2,25 @@ import common
 import controllers
 import common.dispatch
 import logging
+import optparse
 
 _logger = logging.getLogger(__name__)
 
-try:
-    import openerp.wsgi
+class Options(object):
+    pass
+
+def wsgi_postload():
+    import openerp
     import os
     import tempfile
     _logger.info("embedded mode")
-    class Options(object):
-        pass
     o = Options()
-    o.dbfilter = '.*'
+    o.dbfilter = openerp.tools.config['dbfilter']
     o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions")
-    o.addons_path = os.path.dirname(os.path.dirname(__file__))
+    o.addons_path = openerp.modules.module.ad_paths
     o.serve_static = True
-    o.server_host = '127.0.0.1'
-    o.server_port = 8069
+    o.backend = 'local'
 
     app = common.dispatch.Root(o)
-    #import openerp.wsgi
     openerp.wsgi.register_wsgi_handler(app)
 
-except ImportError:
-    _logger.info("standalone mode")
-
-# TODO
-# if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point
-