[FIX] typo, removed wsg_modules entry point (redundant with "module_handlers").
bzr revid: vmt@openerp.com-20110909073145-vqnjhdu0xwb8wurt
This commit is contained in:
parent
5b20065d78
commit
4a1597ab16
|
@ -107,10 +107,6 @@ def legacy_wsgi_xmlrpc(environ, start_response):
|
||||||
def wsgi_jsonrpc(environ, start_response):
|
def wsgi_jsonrpc(environ, start_response):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def wsgi_modules(environ, start_response):
|
|
||||||
""" WSGI handler dispatching to addons-provided entry points."""
|
|
||||||
pass
|
|
||||||
|
|
||||||
def wsgi_webdav(environ, start_response):
|
def wsgi_webdav(environ, start_response):
|
||||||
if environ['REQUEST_METHOD'] == 'OPTIONS' and environ['PATH_INFO'] == '*':
|
if environ['REQUEST_METHOD'] == 'OPTIONS' and environ['PATH_INFO'] == '*':
|
||||||
return return_options(start_response)
|
return return_options(start_response)
|
||||||
|
@ -125,7 +121,7 @@ def wsgi_webdav(environ, start_response):
|
||||||
if path.startswith('/'):
|
if path.startswith('/'):
|
||||||
environ['PATH_INFO'] = path
|
environ['PATH_INFO'] = path
|
||||||
else:
|
else:
|
||||||
environ['PATH_INFO'] = '/' + npath
|
environ['PATH_INFO'] = '/' + path
|
||||||
return http_to_wsgi(http_dir)(environ, start_response)
|
return http_to_wsgi(http_dir)(environ, start_response)
|
||||||
|
|
||||||
def return_options(start_response):
|
def return_options(start_response):
|
||||||
|
@ -280,7 +276,6 @@ def application(environ, start_response):
|
||||||
#wsgi_xmlrpc,
|
#wsgi_xmlrpc,
|
||||||
#wsgi_jsonrpc,
|
#wsgi_jsonrpc,
|
||||||
#legacy_wsgi_xmlrpc,
|
#legacy_wsgi_xmlrpc,
|
||||||
#wsgi_modules,
|
|
||||||
wsgi_webdav
|
wsgi_webdav
|
||||||
] #+ module_handlers
|
] #+ module_handlers
|
||||||
for handler in wsgi_handlers:
|
for handler in wsgi_handlers:
|
||||||
|
@ -312,12 +307,13 @@ def on_starting(server):
|
||||||
arbiter_pid = os.getpid() # TODO check if this is true even after replacing the executable
|
arbiter_pid = os.getpid() # TODO check if this is true even after replacing the executable
|
||||||
config = openerp.tools.config
|
config = openerp.tools.config
|
||||||
config['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc' # need a config file
|
config['addons_path'] = '/home/openerp/repos/addons/trunk-xmlrpc' # need a config file
|
||||||
#config['log_level'] = 10 # debug
|
config['static_http_document_root'] = '/tmp'
|
||||||
|
config['log_level'] = 10 # debug
|
||||||
#openerp.tools.cache = kill_workers_cache
|
#openerp.tools.cache = kill_workers_cache
|
||||||
openerp.netsvc.init_logger()
|
openerp.netsvc.init_logger()
|
||||||
openerp.osv.osv.start_object_proxy()
|
openerp.osv.osv.start_object_proxy()
|
||||||
openerp.service.web_services.start_web_services()
|
openerp.service.web_services.start_web_services()
|
||||||
test_in_thread()
|
#test_in_thread()
|
||||||
|
|
||||||
def test_in_thread():
|
def test_in_thread():
|
||||||
def f():
|
def f():
|
||||||
|
|
Loading…
Reference in New Issue