odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] netsvc.OpenERPDispatcher: that class is gone, replaced by a simple function. 

bzr revid: vmt@openerp.com-20110902141232-umpscnz2cot468hy
This commit is contained in:
Vo Minh Thu 2011-09-02 16:12:32 +02:00
parent 8ca1a87201
commit 9aeba4fece
4 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp-server
View File

@ -266,7 +266,7 @@ if __name__ == "__main__":
if info['wsgi']: if info['wsgi']:
openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi'])) openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
openerp.wsgi.serve() #openerp.wsgi.serve()
setup_pid_file() setup_pid_file()

62
openerp/netsvc.py
View File

@ -393,38 +393,36 @@ def log(title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""):
logger.log(channel, indent+line) logger.log(channel, indent+line)
indent=indent_after indent=indent_after
# This class is used to dispatch a RPC to a service. So it is used def dispatch_rpc(service_name, method, params, auth):
# for both XMLRPC (with a SimpleXMLRPCRequestHandler), and NETRPC. """ Handle a RPC call.
# The service (ExportService) will then dispatch on the method name.
# This can be re-written as a single function This is pure Python code, the actual marshalling (from/to XML-RPC or
# def dispatch(self, service_name, method, params, auth_provider). NET-RPC) is done in a upper laye.
class OpenERPDispatcher: """
def log(self, title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""): def _log(title, msg, channel=logging.DEBUG_RPC, depth=None, fn=""):
log(title, msg, channel=channel, depth=depth, fn=fn) log(title, msg, channel=channel, depth=depth, fn=fn)
def dispatch(self, service_name, method, params): try:
try: logger = logging.getLogger('result')
auth = getattr(self, 'auth_provider', None) start_time = end_time = 0
logger = logging.getLogger('result') if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER):
start_time = end_time = 0 _log('service', tuple(replace_request_password(params)), depth=None, fn='%s.%s'%(service_name,method))
if logger.isEnabledFor(logging.DEBUG_RPC_ANSWER): if logger.isEnabledFor(logging.DEBUG_RPC):
self.log('service', tuple(replace_request_password(params)), depth=None, fn='%s.%s'%(service_name,method)) start_time = time.time()
if logger.isEnabledFor(logging.DEBUG_RPC): result = ExportService.getService(service_name).dispatch(method, auth, params)
start_time = time.time() if logger.isEnabledFor(logging.DEBUG_RPC):
result = ExportService.getService(service_name).dispatch(method, auth, params) end_time = time.time()
if logger.isEnabledFor(logging.DEBUG_RPC): if not logger.isEnabledFor(logging.DEBUG_RPC_ANSWER):
end_time = time.time() _log('service (%.3fs)' % (end_time - start_time), tuple(replace_request_password(params)), depth=1, fn='%s.%s'%(service_name,method))
if not logger.isEnabledFor(logging.DEBUG_RPC_ANSWER): _log('execution time', '%.3fs' % (end_time - start_time), channel=logging.DEBUG_RPC_ANSWER)
self.log('service (%.3fs)' % (end_time - start_time), tuple(replace_request_password(params)), depth=1, fn='%s.%s'%(service_name,method)) _log('result', result, channel=logging.DEBUG_RPC_ANSWER)
self.log('execution time', '%.3fs' % (end_time - start_time), channel=logging.DEBUG_RPC_ANSWER) return result
self.log('result', result, channel=logging.DEBUG_RPC_ANSWER) except Exception, e:
return result _log('exception', tools.exception_to_unicode(e))
except Exception, e: tb = getattr(e, 'traceback', sys.exc_info())
self.log('exception', tools.exception_to_unicode(e)) tb_s = "".join(traceback.format_exception(*tb))
tb = getattr(e, 'traceback', sys.exc_info()) if tools.config['debug_mode'] and isinstance(tb[2], types.TracebackType):
tb_s = "".join(traceback.format_exception(*tb)) import pdb
if tools.config['debug_mode'] and isinstance(tb[2], types.TracebackType): pdb.post_mortem(tb[2])
import pdb raise OpenERPDispatcherException(e, tb_s)
pdb.post_mortem(tb[2])
raise OpenERPDispatcherException(e, tb_s)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

7
openerp/service/http_server.py
View File

@ -271,9 +271,7 @@ def list_http_services(protocol=None):
raise Exception("Incorrect protocol or no http services") raise Exception("Incorrect protocol or no http services")
import SimpleXMLRPCServer import SimpleXMLRPCServer
# Basically, this class extends SimpleXMLRPCRequestHandler to use class XMLRPCRequestHandler(FixSendError,HttpLogHandler,SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
# OpenERPDispatcher as the dispatcher (to select the correct ExportService).
class XMLRPCRequestHandler(netsvc.OpenERPDispatcher,FixSendError,HttpLogHandler,SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
rpc_paths = [] rpc_paths = []
protocol_version = 'HTTP/1.1' protocol_version = 'HTTP/1.1'
_logger = logging.getLogger('xmlrpc') _logger = logging.getLogger('xmlrpc')
@ -281,7 +279,8 @@ class XMLRPCRequestHandler(netsvc.OpenERPDispatcher,FixSendError,HttpLogHandler,
def _dispatch(self, method, params): def _dispatch(self, method, params):
try: try:
service_name = self.path.split("/")[-1] service_name = self.path.split("/")[-1]
return self.dispatch(service_name, method, params) auth = getattr(self, 'auth_provider', None)
return netsvc.dispatch_rpc(service_name, method, params, auth)
except netsvc.OpenERPDispatcherException, e: except netsvc.OpenERPDispatcherException, e:
raise xmlrpclib.Fault(tools.exception_to_unicode(e.exception), e.traceback) raise xmlrpclib.Fault(tools.exception_to_unicode(e.exception), e.traceback)

5
openerp/service/netrpc_server.py
View File

@ -36,7 +36,7 @@ import openerp.netsvc as netsvc
import openerp.tiny_socket as tiny_socket import openerp.tiny_socket as tiny_socket
import openerp.tools as tools import openerp.tools as tools
class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher): class TinySocketClientThread(threading.Thread):
def __init__(self, sock, threads): def __init__(self, sock, threads):
spn = sock and sock.getpeername() spn = sock and sock.getpeername()
spn = 'netrpc-client-%s:%s' % spn[0:2] spn = 'netrpc-client-%s:%s' % spn[0:2]
@ -59,7 +59,8 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
while self.running: while self.running:
try: try:
msg = ts.myreceive() msg = ts.myreceive()
result = self.dispatch(msg[0], msg[1], msg[2:]) auth = getattr(self, 'auth_provider', None)
result = netsvc.dispatch_rpc(msg[0], msg[1], msg[2:], auth)
ts.mysend(result) ts.mysend(result)
except socket.timeout: except socket.timeout:
#terminate this channel because other endpoint is gone #terminate this channel because other endpoint is gone