[IMP] oe web: use openerp/__init__ instead of tools.config to store the gevent flag (similarly to the multi_procsess flag).
bzr revid: vmt@openerp.com-20130118153235-hj6ttxargln4he4c
This commit is contained in:
parent
83b49ff625
commit
669885ce68
|
@ -51,6 +51,8 @@ wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler
|
|||
# its own copy of the data structure and we don't need to care about
|
||||
# locks between threads.
|
||||
multi_process = False
|
||||
# Is the server running with gevent.
|
||||
evented = False
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
@ -11,6 +11,7 @@ import common
|
|||
_logger = logging.getLogger(__name__)
|
||||
|
||||
def run(args):
|
||||
import openerp
|
||||
import openerp.cli.server
|
||||
import openerp.service.wsgi_server
|
||||
import openerp.tools.config
|
||||
|
@ -30,7 +31,7 @@ def run(args):
|
|||
|
||||
target = openerp.service.wsgi_server.serve
|
||||
if not args.gevent:
|
||||
config["gevent"] = False
|
||||
openerp.evented = False
|
||||
# TODO openerp.multi_process with a multi-threaded process probably
|
||||
# doesn't work very well (e.g. waiting for all threads to complete
|
||||
# before killing the process is not implemented).
|
||||
|
@ -38,7 +39,7 @@ def run(args):
|
|||
threading.Thread(target=target, args=arg).start()
|
||||
openerp.cli.server.quit_on_signals()
|
||||
else:
|
||||
config["gevent"] = True
|
||||
openerp.evented = True
|
||||
import gevent.monkey
|
||||
import gevent.wsgi
|
||||
import gevent_psycopg2
|
||||
|
|
Loading…
Reference in New Issue