[REF] netrpc: removed.

bzr revid: vmt@openerp.com-20130130135735-pskmwbkmgfotjx1e

diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 5e83ddd..9f92134 100644 (file)
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -29,7 +29,6 @@ import threading
 import time
 
 import cron
-import netrpc_server
 import web_services
 import web_services
 import wsgi_server
@@ -82,10 +81,8 @@ def start_internal():
     start_internal_done = True
 
 def start_services():
-    """ Start all services including http, netrpc and cron """
+    """ Start all services including http, and cron """
     start_internal()
-    # Initialize the NETRPC server.
-    netrpc_server.start_service()
     # Start the WSGI server.
     wsgi_server.start_service()
     # Start the main cron thread.
@@ -95,7 +92,6 @@ def stop_services():
     """ Stop all services. """
     # stop services
     cron.stop_service()
-    netrpc_server.stop_service()
     wsgi_server.stop_service()
 
     _logger.info("Initiating shutdown")

diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
deleted file mode 100644 (file)
index a94c199..0000000
--- a/openerp/service/netrpc_server.py
+++ /dev/null
@@ -1,245 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#
-# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-#.apidoc title: NET-RPC Server
-
-""" This file contains instance of the net-rpc server
-"""
-import logging
-import select
-import socket
-import sys
-import threading
-import traceback
-import openerp
-import openerp.service.netrpc_socket
-import openerp.netsvc as netsvc
-import openerp.tools as tools
-
-_logger = logging.getLogger(__name__)
-
-class Server:
-    """ Generic interface for all servers with an event loop etc.
-        Override this to impement http, net-rpc etc. servers.
-
-        Servers here must have threaded behaviour. start() must not block,
-        there is no run().
-    """
-    __is_started = False
-    __servers = []
-    __starter_threads = []
-
-    # we don't want blocking server calls (think select()) to
-    # wait forever and possibly prevent exiting the process,
-    # but instead we want a form of polling/busy_wait pattern, where
-    # _server_timeout should be used as the default timeout for
-    # all I/O blocking operations
-    _busywait_timeout = 0.5
-
-    def __init__(self):
-        Server.__servers.append(self)
-        if Server.__is_started:
-            # raise Exception('All instances of servers must be inited before the startAll()')
-            # Since the startAll() won't be called again, allow this server to
-            # init and then start it after 1sec (hopefully). Register that
-            # timer thread in a list, so that we can abort the start if quitAll
-            # is called in the meantime
-            t = threading.Timer(1.0, self._late_start)
-            t.name = 'Late start timer for %s' % str(self.__class__)
-            Server.__starter_threads.append(t)
-            t.start()
-
-    def start(self):
-        _logger.debug("called stub Server.start")
-
-    def _late_start(self):
-        self.start()
-        for thr in Server.__starter_threads:
-            if thr.finished.is_set():
-                Server.__starter_threads.remove(thr)
-
-    def stop(self):
-        _logger.debug("called stub Server.stop")
-
-    def stats(self):
-        """ This function should return statistics about the server """
-        return "%s: No statistics" % str(self.__class__)
-
-    @classmethod
-    def startAll(cls):
-        if cls.__is_started:
-            return
-        _logger.info("Starting %d services" % len(cls.__servers))
-        for srv in cls.__servers:
-            srv.start()
-        cls.__is_started = True
-
-    @classmethod
-    def quitAll(cls):
-        if not cls.__is_started:
-            return
-        _logger.info("Stopping %d services" % len(cls.__servers))
-        for thr in cls.__starter_threads:
-            if not thr.finished.is_set():
-                thr.cancel()
-            cls.__starter_threads.remove(thr)
-
-        for srv in cls.__servers:
-            srv.stop()
-        cls.__is_started = False
-
-    @classmethod
-    def allStats(cls):
-        res = ["Servers %s" % ('stopped', 'started')[cls.__is_started]]
-        res.extend(srv.stats() for srv in cls.__servers)
-        return '\n'.join(res)
-
-    def _close_socket(self):
-        netsvc.close_socket(self.socket)
-
-class TinySocketClientThread(threading.Thread):
-    def __init__(self, sock, threads):
-        spn = sock and sock.getpeername()
-        spn = 'netrpc-client-%s:%s' % spn[0:2]
-        threading.Thread.__init__(self, name=spn)
-        self.sock = sock
-        # Only at the server side, use a big timeout: close the
-        # clients connection when they're idle for 20min.
-        self.sock.settimeout(1200)
-        self.threads = threads
-
-    def run(self):
-        self.running = True
-        try:
-            ts = openerp.server.netrpc_socket.mysocket(self.sock)
-        except Exception:
-            self.threads.remove(self)
-            self.running = False
-            return False
-
-        while self.running:
-            try:
-                msg = ts.myreceive()
-                result = netsvc.dispatch_rpc(msg[0], msg[1], msg[2:])
-                ts.mysend(result)
-            except socket.timeout:
-                #terminate this channel because other endpoint is gone
-                break
-            except Exception, e:
-                try:
-                    valid_exception = Exception(netrpc_handle_exception_legacy(e)) 
-                    valid_traceback = getattr(e, 'traceback', sys.exc_info())
-                    formatted_traceback = "".join(traceback.format_exception(*valid_traceback))
-                    _logger.debug("netrpc: communication-level exception", exc_info=True)
-                    ts.mysend(valid_exception, exception=True, traceback=formatted_traceback)
-                    break
-                except Exception, ex:
-                    #terminate this channel if we can't properly send back the error
-                    _logger.exception("netrpc: cannot deliver exception message to client")
-                    break
-
-        netsvc.close_socket(self.sock)
-        self.sock = None
-        self.threads.remove(self)
-        self.running = False
-        return True
-
-    def stop(self):
-        self.running = False
-        
-def netrpc_handle_exception_legacy(e):
-    if isinstance(e, openerp.osv.orm.except_orm):
-        return 'warning -- ' + e.name + '\n\n' + e.value
-    if isinstance(e, openerp.exceptions.Warning):
-        return 'warning -- Warning\n\n' + str(e)
-    if isinstance(e, openerp.exceptions.AccessError):
-        return 'warning -- AccessError\n\n' + str(e)
-    if isinstance(e, openerp.exceptions.AccessDenied):
-        return 'AccessDenied ' + str(e)
-    return openerp.tools.exception_to_unicode(e)
-
-class TinySocketServerThread(threading.Thread,Server):
-    def __init__(self, interface, port, secure=False):
-        threading.Thread.__init__(self, name="NetRPCDaemon-%d"%port)
-        Server.__init__(self)
-        self.__port = port
-        self.__interface = interface
-        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.socket.bind((self.__interface, self.__port))
-        self.socket.listen(5)
-        self.threads = []
-        _logger.info("starting NET-RPC service on %s:%s", interface or '0.0.0.0', port)
-
-    def run(self):
-        try:
-            self.running = True
-            while self.running:
-                fd_sets = select.select([self.socket], [], [], self._busywait_timeout)
-                if not fd_sets[0]:
-                    continue
-                (clientsocket, address) = self.socket.accept()
-                ct = TinySocketClientThread(clientsocket, self.threads)
-                clientsocket = None
-                self.threads.append(ct)
-                ct.start()
-                lt = len(self.threads)
-                if (lt > 10) and (lt % 10 == 0):
-                    # Not many threads should be serving at the same time, so log
-                    # their abuse.
-                    _logger.debug("Netrpc: %d threads", len(self.threads))
-            self.socket.close()
-        except Exception, e:
-            _logger.warning("Netrpc: closing because of exception %s", e)
-            self.socket.close()
-            return False
-
-    def stop(self):
-        self.running = False
-        for t in self.threads:
-            t.stop()
-        self._close_socket()
-
-    def stats(self):
-        res = "Net-RPC: " + ( (self.running and "running") or  "stopped")
-        i = 0
-        for t in self.threads:
-            i += 1
-            res += "\nNet-RPC #%d: %s " % (i, t.name)
-            if t.isAlive():
-                res += "running"
-            else:
-                res += "finished"
-            if t.sock:
-                res += ", socket"
-        return res
-
-netrpcd = None
-
-def start_service():
-    global netrpcd
-    if tools.config.get('netrpc', False):
-        netrpcd = TinySocketServerThread(tools.config.get('netrpc_interface', ''), int(tools.config.get('netrpc_port', 8070)))
-
-def stop_service():
-    Server.quitAll()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/openerp/service/netrpc_socket.py b/openerp/service/netrpc_socket.py
deleted file mode 100644 (file)
index c49c8f7..0000000
--- a/openerp/service/netrpc_socket.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import socket
-import cPickle
-import cStringIO
-
-import openerp.netsvc as netsvc
-
-# Pickle protocol version 2 is optimized compared to default (version 0)
-PICKLE_PROTOCOL = 2
-
-class Myexception(Exception):
-    """
-    custom exception object store
-    * faultcode
-    * faulestring
-    * args
-    """
-    
-    def __init__(self, faultCode, faultString):
-        self.faultCode = faultCode
-        self.faultString = faultString
-        self.args = (faultCode, faultString)
-
-class mysocket:
-
-    def __init__(self, sock=None):
-        if sock is None:
-            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        else:
-            self.sock = sock
-        # self.sock.settimeout(120)
-        # prepare this socket for long operations: it may block for infinite
-        # time, but should exit as soon as the net is down
-        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-        
-    def connect(self, host, port=False):
-        if not port:
-            protocol, buf = host.split('//')
-            host, port = buf.split(':')
-        self.sock.connect((host, int(port)))
-        
-    def disconnect(self):
-        netsvc.close_socket(self.sock)
-        
-    def mysend(self, msg, exception=False, traceback=None):
-        msg = cPickle.dumps([msg, traceback], PICKLE_PROTOCOL)
-        self.sock.sendall('%8d%d%s' % (len(msg), bool(exception), msg))
-            
-    def myreceive(self):
-        buf=''
-        while len(buf) < 9:
-            chunk = self.sock.recv(9 - len(buf))
-            if not chunk:
-                raise socket.timeout
-            buf += chunk
-        size = int(buf[:8])
-        if buf[8] != "0":
-            exception = buf[8]
-        else:
-            exception = False
-        msg = ''
-        while len(msg) < size:
-            chunk = self.sock.recv(size-len(msg))
-            if not chunk:
-                raise socket.timeout
-            msg = msg + chunk
-        msgio = cStringIO.StringIO(msg)
-        unpickler = cPickle.Unpickler(msgio)
-        unpickler.find_global = None
-        res = unpickler.load()
-
-        if isinstance(res[0],Exception):
-            if exception:
-                raise Myexception(str(res[0]), str(res[1]))
-            raise res[0]
-        else:
-            return res[0]
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: