Skip to content

Commit fde999d

Browse files
committed
fix: initialize the requests with the dirac setup caller
1 parent a657d3f commit fde999d

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ def export_listUniqueKeyValues(self, typeName):
8080
8181
:return: S_OK({key:[]}) or S_ERROR() The key is element of the __keyFields of the BaseType
8282
"""
83-
setup = self.serviceInfoDict.get("clientSetup", None)
84-
if not setup:
85-
return S_ERROR("FATAL ERROR: Problem with the service configuration!")
8683
# NOTE: we can apply some policies if it will be needed!
8784
return self.__db.getKeyValues(typeName)
8885

@@ -95,7 +92,7 @@ def export_listReports(self, typeName):
9592
:return: S_OK([]) or S_ERROR() the list of available plots
9693
"""
9794

98-
reporter = MainReporter(self.__db, self.serviceInfoDict["clientSetup"])
95+
reporter = MainReporter(self.__db, self.diracSetup)
9996
return reporter.list(typeName)
10097

10198
def transfer_toClient(self, fileId, token, fileHelper):
@@ -221,7 +218,7 @@ def export_generatePlot(self, reportRequest):
221218
retVal = self.__checkPlotRequest(reportRequest)
222219
if not retVal["OK"]:
223220
return retVal
224-
reporter = MainReporter(self.__db, self.serviceInfoDict["clientSetup"])
221+
reporter = MainReporter(self.__db, self.diracSetup)
225222
reportRequest["generatePlot"] = True
226223
return reporter.generate(reportRequest, self.getRemoteCredentials())
227224

@@ -245,7 +242,7 @@ def export_getReport(self, reportRequest):
245242
retVal = self.__checkPlotRequest(reportRequest)
246243
if not retVal["OK"]:
247244
return retVal
248-
reporter = MainReporter(self.__db, self.serviceInfoDict["clientSetup"])
245+
reporter = MainReporter(self.__db, self.diracSetup)
249246
reportRequest["generatePlot"] = False
250247
return reporter.generate(reportRequest, self.getRemoteCredentials())
251248

@@ -278,8 +275,7 @@ def export_addRecords(self, indexname, monitoringType, data):
278275
:param list data: data to insert
279276
:returns: S_OK or S_ERROR
280277
"""
281-
setup = self.serviceInfoDict.get("clientSetup", "")
282-
indexname = "%s_%s" % (setup.lower(), indexname)
278+
indexname = "%s_%s" % (self.diracSetup.lower(), indexname)
283279
gLogger.debug("Bulk index:", indexname)
284280
mapping = self.__db.getMapping(monitoringType)
285281
gLogger.debug("Mapping:", mapping)
@@ -294,8 +290,7 @@ def export_deleteIndex(self, indexName):
294290
295291
:param str indexName: name of the index
296292
"""
297-
setup = self.serviceInfoDict.get("clientSetup", "")
298-
indexName = "%s_%s" % (setup.lower(), indexName)
293+
indexName = "%s_%s" % (self.diracSetup.lower(), indexName)
299294
gLogger.debug("delete index:", indexName)
300295
return self.__db.deleteIndex(indexName)
301296

@@ -373,4 +368,6 @@ def export_pingDB(self):
373368

374369

375370
class MonitoringHandler(MonitoringHandlerMixin, RequestHandler):
376-
pass
371+
def initialize(self):
372+
self.diracSetup = self.serviceInfoDict["clientSetup"]
373+
return S_OK()

src/DIRAC/MonitoringSystem/Service/TornadoMonitoringHandler.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
class TornadoMonitoringHandler(MonitoringHandlerMixin, TornadoService):
2323
log = sLog
2424

25+
def initializeRequest(self):
26+
self.diracSetup = self.get_argument("clientSetup")
27+
return S_OK()
28+
2529
types_streamToClient = []
2630

2731
def export_streamToClient(self, fileId):

0 commit comments

Comments
 (0)