Merge pull request #7584 from andresailer/int_FixGetDBs

[9.0] fix getMonitoringDB, getPilotAgentsDB returning None
DIRACGrid · Apr 18, 2024 · 347fdc2 · 347fdc2
2 parents 46b55a3 + e9f2084
commit 347fdc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/DIRAC/MonitoringSystem/Client/ServerUtils.py b/src/DIRAC/MonitoringSystem/Client/ServerUtils.py
@@ -11,6 +11,8 @@ def getMonitoringDB():
         if gMonitoringDB and gMonitoringDB._connected:
             return gMonitoringDB
     except Exception:
-        from DIRAC.Core.Base.Client import Client
+        pass
 
-        return Client(url="Monitoring/Monitoring")
+    from DIRAC.Core.Base.Client import Client
+
+    return Client(url="Monitoring/Monitoring")
diff --git a/src/DIRAC/WorkloadManagementSystem/Client/ServerUtils.py b/src/DIRAC/WorkloadManagementSystem/Client/ServerUtils.py
@@ -13,4 +13,6 @@ def getPilotAgentsDB():
         if gPilotAgentsDB and gPilotAgentsDB._connected:
             return gPilotAgentsDB
     except Exception:
-        return Client(url="WorkloadManagement/PilotManager")
+        pass
+
+    return Client(url="WorkloadManagement/PilotManager")