survies_server_restart: ignore (verbosely) all socket errors

Relates: fedora-copr/copr#3113
praiskup · Jan 27, 2024 · 2f64b6f · 2f64b6f
1 parent a267c45
commit 2f64b6f
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/resalloc/client.py b/resalloc/client.py
@@ -23,15 +23,6 @@ class _WrappedXMLRPCClient(object):
     def __init__(self, connection_string, survive_server_restart):
         self._conn = C_XMLRPC(connection_string)
         self.survive_server_restart = survive_server_restart
-        self._retry_errors = [
-            errno.ECONNREFUSED,
-            errno.ECONNABORTED,
-            errno.ECONNRESET,
-            errno.ENETUNREACH,
-            errno.ENETRESET,
-            errno.ENETDOWN,
-            errno.EADDRNOTAVAIL,
-        ]
 
     def call(self, name, *args):
         """
@@ -43,11 +34,10 @@ def call(self, name, *args):
         while True:
             try:
                 return fcall(*args)
-            except socket.error as os_e:
+            except socket.error as sock_err:
+                print(str(sock_err), file=sys.stderr)
                 if not self.survive_server_restart:
                     raise
-                if os_e.errno not in self._retry_errors:
-                    raise
             except RPCEXCEPTION as ex:
                 print(str(ex), file=sys.stderr)
             time.sleep(3)