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']:
openerp.wsgi.register_wsgi_handler(getattr(sys.modules[m], info['wsgi']))
openerp.wsgi.serve()
#openerp.wsgi.serve()
setup_pid_file()

26
openerp/netsvc.py
View File

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

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")
import SimpleXMLRPCServer
# Basically, this class extends SimpleXMLRPCRequestHandler to use
# OpenERPDispatcher as the dispatcher (to select the correct ExportService).
class XMLRPCRequestHandler(netsvc.OpenERPDispatcher,FixSendError,HttpLogHandler,SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
class XMLRPCRequestHandler(FixSendError,HttpLogHandler,SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
rpc_paths = []
protocol_version = 'HTTP/1.1'
_logger = logging.getLogger('xmlrpc')
@ -281,7 +279,8 @@ class XMLRPCRequestHandler(netsvc.OpenERPDispatcher,FixSendError,HttpLogHandler,
def _dispatch(self, method, params):
try:
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:
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.tools as tools
class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
class TinySocketClientThread(threading.Thread):
def __init__(self, sock, threads):
spn = sock and sock.getpeername()
spn = 'netrpc-client-%s:%s' % spn[0:2]
@ -59,7 +59,8 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher):
while self.running:
try:
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)
except socket.timeout:
#terminate this channel because other endpoint is gone