From 47f152d4998fdfad7cbc782d6821db37a981cc64 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 16 Sep 2011 13:03:47 +0200 Subject: [PATCH] [imp] modified wsgi loading according to vmt indications bzr revid: nicolas.vanhoren@openerp.com-20110916110347-1ep18zoyskz9kysz --- addons/web/__init__.py | 6 +----- addons/web/__openerp__.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/web/__init__.py b/addons/web/__init__.py index bcb8f6db28c..2478edb81b7 100644 --- a/addons/web/__init__.py +++ b/addons/web/__init__.py @@ -5,8 +5,7 @@ import logging _logger = logging.getLogger(__name__) - -try: +def wsgi_postload(): import openerp.wsgi import os import tempfile @@ -24,9 +23,6 @@ try: #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 diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 9a1fd119fb9..74633fa4969 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -45,5 +45,5 @@ "static/src/css/base.css", "static/src/css/data_export.css", ], - 'wsgi' : 'app', + 'post_load' : 'wsgi_postload', }