fix: logging

infn-datacloud · Jan 23, 2025 · 5b89d4b · 5b89d4b
1 parent 0713121
commit 5b89d4b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/providers/core.py b/src/providers/core.py
@@ -54,10 +54,11 @@ def retrieve_data(self, item: ConnectionThread) -> OpenstackData | None:
         """Get provider data"""
         try:
             return item.get_provider_data()
-        except (OpenstackProviderError, NotImplementedError) as e:
+        except OpenstackProviderError:
+            self.error = True
+        except NotImplementedError as e:
             self.error = True
             self.logger.error(e)
-            self.logger.error("Skipping project")
         return None
 
     def get_issuer_matching_project(self, project_sla: str) -> Issuer:

diff --git a/src/providers/openstack.py b/src/providers/openstack.py
@@ -130,7 +130,7 @@ def retrieve_info(self) -> None:
         ) as e:
             self.error = True
             self.logger.error(e)
-            self.logger.error("Connection aborted")
+            self.logger.error("Connection aborted. Skipping project")
             raise OpenstackProviderError from e
         self.conn.close()
         self.logger.info("Connection closed")

diff --git a/tests/providers/openstack/test_retrieve_info.py b/tests/providers/openstack/test_retrieve_info.py
@@ -264,7 +264,7 @@ def test_project_connection_error(
     assert len(openstack_item.network_services) == 0
     assert len(openstack_item.object_store_services) == 0
 
-    assert caplog.text.strip("\n").endswith("Connection aborted")
+    assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")
 
 
 @patch("src.providers.openstack.OpenstackData")
@@ -318,7 +318,7 @@ def test_block_storage_connection_error(
     assert len(openstack_item.network_services) == 0
     assert len(openstack_item.object_store_services) == 0
 
-    assert caplog.text.strip("\n").endswith("Connection aborted")
+    assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")
 
 
 @patch("src.providers.openstack.OpenstackData")
@@ -375,7 +375,7 @@ def test_compute_connection_error(
     assert len(openstack_item.network_services) == 0
     assert len(openstack_item.object_store_services) == 0
 
-    assert caplog.text.strip("\n").endswith("Connection aborted")
+    assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")
 
 
 @patch("src.providers.openstack.OpenstackData")
@@ -433,7 +433,7 @@ def test_network_connection_error(
     assert len(openstack_item.network_services) == 0
     assert len(openstack_item.object_store_services) == 0
 
-    assert caplog.text.strip("\n").endswith("Connection aborted")
+    assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")
 
 
 # @patch("src.providers.openstack.OpenstackData")
@@ -486,7 +486,7 @@ def test_network_connection_error(
 # assert openstack_item.network_service == network_service_create
 # assert len(openstack_item.object_store_services) == 0
 
-#     assert caplog.text.strip("\n").endswith("Connection aborted")
+#     assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")
 
 
 @patch("src.providers.openstack.OpenstackData")
@@ -545,4 +545,4 @@ def test_s3_connection_error(
     assert openstack_item.network_services[0] == network_service_create
     assert len(openstack_item.object_store_services) == 0
 
-    assert caplog.text.strip("\n").endswith("Connection aborted")
+    assert caplog.text.strip("\n").endswith("Connection aborted. Skipping project")