diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2011-09-12 12:21:47 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2011-09-12 12:21:47 +0200 |
| commit | 995a037f2d218a9443f8db226b7b135979f9d3e2 (patch) | |
| tree | 1a12310bc87936f21d3a58a95ebee9451e2b0798 | |
| parent | 77fbcb3c79743e151656cf2ad2e93d3d61b5b655 (diff) | |
[IMP] wsgi: set the config via gunicorn config file.
bzr revid: vmt@openerp.com-20110912102147-yxgv9hpm4fvoxqn6
| -rw-r--r-- | gunicorn.conf.py | 7 | ||||
| -rwxr-xr-x | openerp-server | 6 | ||||
| -rw-r--r-- | openerp/wsgi.py | 11 |
3 files changed, 14 insertions, 10 deletions
diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 0c1709dbed5..7b117c040f6 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -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 diff --git a/openerp-server b/openerp-server index 7965a0c073d..7b734e2ef1a 100755 --- a/openerp-server +++ b/openerp-server @@ -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() diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 71694dee594..2bfb793f58b 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -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() |