From: Antony Lesuisse Date: Fri, 9 Sep 2011 16:00:39 +0000 (+0200) Subject: [IMP] hack to register the wsgi handler when running embbeded in openerp-server. X-Git-Tag: 6.1.0-rc1-addons~2675 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;ds=sidebyside;h=df5dd1f7b7d4ad8219009d97774b22ddc017d33a;p=odoo%2Fodoo.git [IMP] hack to register the wsgi handler when running embbeded in openerp-server. bzr revid: al@openerp.com-20110909160039-6ddslilpttvhubad --- diff --git a/addons/web/__init__.py b/addons/web/__init__.py index 343b53d..5a3f33f 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -1,5 +1,28 @@ import common import controllers +import common.dispatch + +try: + import openerp + import os + import tempfile + print "embedded mode" + class Options(object): + pass + o = Options() + o.dbfilter = '.*' + o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions") + o.addons_path = os.path.dirname(os.path.dirname(__file__)) + o.serve_static = True + o.server_host = '127.0.0.1' + o.server_port = 8069 + + app = common.dispatch.Root(o) + #import openerp.wsgi + openerp.wsgi.register_wsgi_handler(app) + +except ImportError: + print "standalone mode" # TODO # if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index a6e438a..dd4d207 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -45,4 +45,5 @@ "static/src/css/base.css", "static/src/css/data_export.css", ], + 'wsgi' : 'app', }