openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-785009-ysa into lp:openobject-server.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
Related bugs:
  Bug #785009 in OpenERP Server: "Server stop responding on xmlrpc service with port 8070(if netrpc service running on this port)"
  https://bugs.launchpad.net/openobject-server/+bug/785009

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-785009-ysa/+merge/62616

fix problem of pass wrong port number in xml-rpc service.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-785009-ysa/+merge/62616
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-785009-ysa.

=== modified file 'openerp/service/netrpc_server.py'
--- openerp/service/netrpc_server.py	2011-02-07 12:57:23 +0000
+++ openerp/service/netrpc_server.py	2011-05-27 07:27:25 +0000
@@ -15,13 +15,13 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 """ This file contains instance of the net-rpc server
 
-    
+
 """
 import logging
 import select
@@ -87,6 +87,7 @@
                     tb_s = "".join(traceback.format_exception(*tb))
                     logging.getLogger('web-services').debug("netrpc: communication-level exception", exc_info=True)
                     ts.mysend(e, exception=True, traceback=tb_s)
+                    self.sock.shutdown(True)
                 except Exception, ex:
                     #terminate this channel if we can't properly send back the error
                     logging.getLogger('web-services').exception("netrpc: cannot deliver exception message to client")
@@ -111,7 +112,7 @@
         self.socket.bind((self.__interface, self.__port))
         self.socket.listen(5)
         self.threads = []
-        netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO, 
+        netsvc.Logger().notifyChannel("web-services", netsvc.LOG_INFO,
                          "starting NET-RPC service at %s port %d" % (interface or '0.0.0.0', port,))
 
     def run(self):
@@ -164,5 +165,5 @@
     global netrpcd
     if tools.config.get('netrpc', False):
         netrpcd = TinySocketServerThread(
-            tools.config.get('netrpc_interface', ''), 
+            tools.config.get('netrpc_interface', ''),
             int(tools.config.get('netrpc_port', 8070)))