Continued:

- also catch this exception here, avoiding a lot of more requests to unreachable websites

diff --git a/fba/commands.py b/fba/commands.py
index 3f37fae795cbae1ce0d3332c616607ba7aa070ce..6554e2ddc5b79e3e32fd7e17ee750889bf32c099 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -109,7 +109,7 @@ def fetch_bkali(args: argparse.Namespace):
             try:
                 print(f"INFO: Fetching instances from domain='{domain}' ...")
                 federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
-            except requests.exceptions.Timeout as ex:
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
                 print(f"WARNING: Timeout during fetching instances from domain='{domain}'")
                 instances.update_last_error(domain, ex)
 
@@ -320,7 +320,7 @@ def fetch_cs(args: argparse.Namespace):
                     try:
                         print(f"INFO: Fetching instances from domain='{row['domain']}' ...")
                         federation.fetch_instances(row["domain"], 'chaos.social', None, inspect.currentframe().f_code.co_name)
-                    except requests.exceptions.Timeout as ex:
+                    except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
                         print(f"WARNING: Timeout during fetching instances from domain='{row['domain']}'")
                         instances.update_last_error(row["domain"], ex)
 
@@ -368,7 +368,7 @@ def fetch_fba_rss(args: argparse.Namespace):
             try:
                 print(f"INFO: Fetching instances from domain='{domain}' ...")
                 federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
-            except requests.exceptions.Timeout as ex:
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
                 print(f"WARNING: Timeout during fetching instances from domain='{domain}'")
                 instances.update_last_error(domain, ex)
 
@@ -421,7 +421,7 @@ def fetch_fbabot_atom(args: argparse.Namespace):
             try:
                 print(f"INFO: Fetching instances from domain='{domain}' ...")
                 federation.fetch_instances(domain, None, None, inspect.currentframe().f_code.co_name)
-            except requests.exceptions.Timeout as ex:
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
                 print(f"WARNING: Timeout during fetching instances from domain='{domain}'")
                 instances.update_last_error(domain, ex)
 
@@ -435,7 +435,7 @@ def fetch_instances(args: argparse.Namespace):
     try:
         print(f"INFO: Fetching instances from args.domain='{args.domain}' ...")
         federation.fetch_instances(args.domain, None, None, inspect.currentframe().f_code.co_name)
-    except requests.exceptions.Timeout as ex:
+    except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
         print(f"WARNING: Timeout during fetching instances from args.domain='{args.domain}'")
         instances.update_last_error(args.domain, ex)
         return
@@ -460,7 +460,7 @@ def fetch_instances(args: argparse.Namespace):
         try:
             print(f"INFO: Fetching instances for instance '{row[0]}' ('{row[2]}') of origin='{row[1]}',nodeinfo_url='{row[3]}'")
             federation.fetch_instances(row[0], row[1], row[2], inspect.currentframe().f_code.co_name, row[3])
-        except requests.exceptions.Timeout as ex:
+        except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
             print(f"WARNING: Timeout during fetching instances from domain='{row[0]}'")
             instances.update_last_error(row[0], ex)
 
@@ -493,7 +493,7 @@ def fetch_federater(args: argparse.Namespace):
             try:
                 print(f"INFO: Fetching instances for instane='{row['#domain']}' ...")
                 federation.fetch_instances(row["#domain"], None, None, inspect.currentframe().f_code.co_name)
-            except requests.exceptions.Timeout as ex:
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as ex:
                 print(f"WARNING: Timeout during fetching instances from domain='{row['#domain']}'")
                 instances.update_last_error(row["#domain"], ex)