[FIX] osv.fields.one2many: corrected get() after incorrect patches

[odoo/odoo.git] / bin / tiny_socket.py

diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py
index 746d6c2..6a0d937 100644 (file)
--- a/bin/tiny_socket.py
+++ b/bin/tiny_socket.py
@@ -25,27 +25,40 @@ import cStringIO
 import marshal
 
 class Myexception(Exception):
+    """
+    custome 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)
+            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         else:
             self.sock = sock
-        self.sock.settimeout(120)
+        # 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):
         self.sock.shutdown(socket.SHUT_RDWR)
         self.sock.close()
+        
     def mysend(self, msg, exception=False, traceback=None):
         msg = cPickle.dumps([msg,traceback])
         size = len(msg)
@@ -57,12 +70,13 @@ class mysocket:
             if sent == 0:
                 raise RuntimeError, "socket connection broken"
             totalsent = totalsent + sent
+            
     def myreceive(self):
         buf=''
         while len(buf) < 8:
             chunk = self.sock.recv(8 - len(buf))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
+            if not chunk:
+                raise socket.timeout
             buf += chunk
         size = int(buf)
         buf = self.sock.recv(1)
@@ -73,8 +87,8 @@ class mysocket:
         msg = ''
         while len(msg) < size:
             chunk = self.sock.recv(size-len(msg))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
+            if not chunk:
+                raise socket.timeout
             msg = msg + chunk
         msgio = cStringIO.StringIO(msg)
         unpickler = cPickle.Unpickler(msgio)
@@ -87,6 +101,3 @@ class mysocket:
             raise res[0]
         else:
             return res[0]
-
-
-