Merge pull request #7578 from andresailer/8_fixgMDB

[8.0] fix getMonitoringDB returning None
DIRACGrid · Apr 18, 2024 · 749ce65 · 749ce65
2 parents 85bbc83 + be86e0e
commit 749ce65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 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,7 +13,9 @@ def getPilotAgentsDB():
         if gPilotAgentsDB and gPilotAgentsDB._connected:
             return gPilotAgentsDB
     except Exception:
-        return Client(url="WorkloadManagement/PilotManager")
+        pass
+
+    return Client(url="WorkloadManagement/PilotManager")
 
 
 def getVirtualMachineDB():
@@ -23,4 +25,6 @@ def getVirtualMachineDB():
         if gVirtualMachineDB and gVirtualMachineDB._connected:
             return gVirtualMachineDB
     except Exception:
-        return Client(url="WorkloadManagement/VirtualMachineManager")
+        pass
+
+    return Client(url="WorkloadManagement/VirtualMachineManager")