socket error handling

lib/util.py

@@ -290,24 +290,21 @@ class SocketPipe:
                 sent = self.socket.send(out)
                 out = out[sent:]
             except ssl.SSLError as e:
-                print_error( "SSLError: retry", e)
+                print_error("SSLError:", e)
                 time.sleep(0.1)
                 continue
-
             except socket.error as e:
                 if e[0] in (errno.EWOULDBLOCK,errno.EAGAIN):
                     print_error("EAGAIN: retrying")
                     time.sleep(0.1)
                     continue
-                elif e[0] == 'The write operation timed out':
-                    print_error( "ssl: retry")
+                elif e[0] in ['timed out', 'The write operation timed out']:
+                    print_error("socket timeout, retry")
                     time.sleep(0.1)
                     continue
                 else:
-                    print repr(e[0])
                     traceback.print_exc(file=sys.stdout)
-                    print_error( "Not connected, cannot send" )
-                    return False
+                    raise e