[IMP] wsgi: set the config via gunicorn config file.
bzr revid: vmt@openerp.com-20110912102147-yxgv9hpm4fvoxqn6
This commit is contained in:
parent
77fbcb3c79
commit
995a037f2d
|
@ -8,3 +8,10 @@ workers = 1
|
|||
on_starting = openerp.wsgi.on_starting
|
||||
when_ready = openerp.wsgi.when_ready
|
||||
timeout = 240 # openerp request-response cycle can be quite long
|
||||
|
||||
# Setting openerp.conf.xxx will be better than setting
|
||||
# openerp.tools.config['xxx']
|
||||
conf = openerp.tools.config
|
||||
conf['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc'
|
||||
conf['static_http_document_root'] = '/tmp'
|
||||
#conf['log_level'] = 10 # 10 is DEBUG
|
||||
|
|
|
@ -271,9 +271,9 @@ if __name__ == "__main__":
|
|||
if info['wsgi']:
|
||||
openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
|
||||
|
||||
openerp.osv.osv.start_object_proxy()
|
||||
openerp.service.web_services.start_web_services()
|
||||
openerp.wsgi.serve()
|
||||
#openerp.osv.osv.start_object_proxy()
|
||||
#openerp.service.web_services.start_web_services()
|
||||
#openerp.wsgi.serve()
|
||||
|
||||
|
||||
setup_pid_file()
|
||||
|
|
|
@ -273,11 +273,11 @@ def application(environ, start_response):
|
|||
|
||||
# Try all handlers until one returns some result (i.e. not None).
|
||||
wsgi_handlers = [
|
||||
#wsgi_xmlrpc,
|
||||
#wsgi_jsonrpc,
|
||||
#legacy_wsgi_xmlrpc,
|
||||
wsgi_xmlrpc,
|
||||
wsgi_jsonrpc,
|
||||
legacy_wsgi_xmlrpc,
|
||||
wsgi_webdav
|
||||
] #+ module_handlers
|
||||
] + module_handlers
|
||||
for handler in wsgi_handlers:
|
||||
result = handler(environ, start_response)
|
||||
if result is None:
|
||||
|
@ -306,9 +306,6 @@ def on_starting(server):
|
|||
global arbiter_pid
|
||||
arbiter_pid = os.getpid() # TODO check if this is true even after replacing the executable
|
||||
config = openerp.tools.config
|
||||
config['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc' # need a config file
|
||||
config['static_http_document_root'] = '/tmp'
|
||||
#config['log_level'] = 10 # debug
|
||||
#openerp.tools.cache = kill_workers_cache
|
||||
openerp.netsvc.init_logger()
|
||||
openerp.osv.osv.start_object_proxy()
|
||||
|
|
Loading…
Reference in New Issue