Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-opw-575322-port-rma into lp:openobject-server

  1. trunk-opw-575322-port-rma
  2. Merge into trunk
Proposed by Randhir Mayatra (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-opw-575322-port-rma
Merge into: lp:openobject-server
Diff against target: 46 lines (+18/-18)
1 file modified
openerp/service/netrpc_server.py (+18/-18)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-opw-575322-port-rma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+138390@code.launchpad.net

Description of the change

Hello,

 -- Fixed an issue with netrpc: signals not being correctly handled
    This branch fixes this issue.

    Code is forward port from 6.1

 -- Thank You !!!
    -- RMA

To post a comment you must log in.

Unmerged revisions

4643. By <email address hidden>

[FIX] Fixed an issue with netrpc: signals not being correctly handled

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/service/netrpc_server.py'
--- openerp/service/netrpc_server.py 2012-09-22 10:51:07 +0000
+++ openerp/service/netrpc_server.py 2012-12-06 07:13:22 +0000
@@ -116,24 +116,24 @@
116 try:116 try:
117 self.running = True117 self.running = True
118 while self.running:118 while self.running:
119 fd_sets = select.select([self.socket], [], [], self._busywait_timeout)119 try:
120 if not fd_sets[0]:120 fd_sets = select.select([self.socket], [], [], self._busywait_timeout)
121 continue121 if not fd_sets[0]:
122 (clientsocket, address) = self.socket.accept()122 continue
123 ct = TinySocketClientThread(clientsocket, self.threads)123 (clientsocket, address) = self.socket.accept()
124 clientsocket = None124 ct = TinySocketClientThread(clientsocket, self.threads)
125 self.threads.append(ct)125 clientsocket = None
126 ct.start()126 self.threads.append(ct)
127 lt = len(self.threads)127 ct.start()
128 if (lt > 10) and (lt % 10 == 0):128 lt = len(self.threads)
129 # Not many threads should be serving at the same time, so log129 if (lt > 10) and (lt % 10 == 0):
130 # their abuse.130 # Not many threads should be serving at the same time, so log
131 _logger.debug("Netrpc: %d threads", len(self.threads))131 # their abuse.
132 self.socket.close()132 _logger.debug("Netrpc: %d threads", len(self.threads))
133 except Exception, e:133 except Exception, e:
134 _logger.warning("Netrpc: closing because of exception %s", e)134 _logger.warning('Exception during main netrpc loop, resuming. Exception: %s', e)
135 self.socket.close()135 finally:
136 return False136 self.socket.close()
137137
138 def stop(self):138 def stop(self):
139 self.running = False139 self.running = False