@@ -473,9 +473,9 @@ def check(self):
 
 class SocketService(SimpleService):
     def __init__(self, configuration=None, name=None):
+        self._sock = None
         self.host = "localhost"
         self.port = None
-        self.sock = None
         self.unix_socket = None
         self.request = ""
         SimpleService.__init__(self, configuration=configuration, name=name)
@@ -485,61 +485,84 @@ def _get_raw_data(self):
         Get raw data with low-level "socket" module.
         :return: str
         """
-        if self.sock is None:
+        if self._sock is None:
             try:
                 if self.unix_socket is None:
-                    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+                    self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                    self._sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                     #sock.setsockopt(socket.SOL_SOCKET, socket.TCP_NODELAY, 1)
                     #sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
                     #sock.settimeout(self.update_every)
-                    sock.settimeout(0.5)
-                    sock.connect((self.host, self.port))
-                    sock.settimeout(0.5)  # Just to be sure
+                    self._sock.settimeout(0.5)
+                    self._sock.connect((self.host, self.port))
+                    self._sock.settimeout(0.5)  # Just to be sure
                 else:
-                    sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-                    #sock.settimeout(self.update_every)
-                    sock.settimeout(0.05)
-                    sock.connect(self.unix_socket)
-                    sock.settimeout(0.05)  # Just to be sure
+                    self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+                    #self._sock.settimeout(self.update_every)
+                    self._sock.settimeout(0.05)
+                    self._sock.connect(self.unix_socket)
+                    self._sock.settimeout(0.05)  # Just to be sure
 
             except Exception as e:
                 self.error(str(e), "used configuration: host:", str(self.host), "port:", str(self.port), "socket:", str(self.unix_socket))
-                self.sock = None
+                self._sock = None
                 return None
 
         if self.request != "".encode():
             try:
-                sock.send(self.request)
+                self._sock.send(self.request)
             except Exception as e:
                 try:
-                    sock.shutdown(1)
-                    sock.close()
+                    self._sock.shutdown(1)
+                    self._sock.close()
                 except:
                     pass
-                self.sock = None
+                self._sock = None
                 self.error(str(e), "used configuration: host:", str(self.host), "port:", str(self.port), "socket:", str(self.unix_socket))
                 return None
+        # data = ""
+        # import select
+        # while True:
+        #     try:
+        #         ready_to_read, _, in_error = select.select([sock, ], [], [], 0.01)
+        #     except Exception as e:
+        #         self.debug("SELECT", str(e))
+        #         sock.shutdown(0)
+        #         break
+        #     if len(ready_to_read) > 0:
+        #         buf = sock.recv(1024)
+        #         if len(buf) == 0 or buf is None:
+        #             break
+        #         data += buf.decode()
+        # if data == "":
+        #     return None
+        # return data
 
         size = 2
         try:
-            data = sock.recv(size).decode()
+            data = self._sock.recv(size).decode()
         except Exception as e:
             self.error(str(e), "used configuration: host:", str(self.host), "port:", str(self.port), "socket:", str(self.unix_socket))
-            sock.close()
+            self._sock.close()
             return None
 
         while True:
             # implement something like TCP Window Scaling
             if size < 4096:
                 size *= 2
-            buf = sock.recv(size)
+            buf = self._sock.recv(size)
             data += buf.decode()
             if len(buf) < size:
-                break
+                if self._more_data_available():
+                    size = 2
+                else:
+                    break
 
         return data
 
+    def _more_data_available(self):
+        return False
+
     def _parse_config(self):
         """
         Parse configuration data
 
@@ -3,6 +3,7 @@
 # Author: Pawel Krupa (paulfantom)
 
 from base import SocketService
+import select
 
 # default module values (can be overridden per job in `config`)
 # update_every = 2
@@ -76,6 +77,16 @@ def _get_data(self):
         else:
             return data
 
+    def _more_data_available(self):
+        try:
+            ready_to_read, _, in_error = select.select([self._sock, ], [], [], 0.05)
+        except Exception as e:
+            self.debug("select returned exception", str(e))
+        if len(ready_to_read) > 0:
+            return True
+        else:
+            return False
+
     def check(self):
         """
         Parse essential configuration, autodetect squid configuration (if needed), and check if data is available