@@ -80,9 +80,6 @@ def export_listUniqueKeyValues(self, typeName):
80
80
81
81
:return: S_OK({key:[]}) or S_ERROR() The key is element of the __keyFields of the BaseType
82
82
"""
83
- setup = self .serviceInfoDict .get ("clientSetup" , None )
84
- if not setup :
85
- return S_ERROR ("FATAL ERROR: Problem with the service configuration!" )
86
83
# NOTE: we can apply some policies if it will be needed!
87
84
return self .__db .getKeyValues (typeName )
88
85
@@ -95,7 +92,7 @@ def export_listReports(self, typeName):
95
92
:return: S_OK([]) or S_ERROR() the list of available plots
96
93
"""
97
94
98
- reporter = MainReporter (self .__db , self .serviceInfoDict [ "clientSetup" ] )
95
+ reporter = MainReporter (self .__db , self .diracSetup )
99
96
return reporter .list (typeName )
100
97
101
98
def transfer_toClient (self , fileId , token , fileHelper ):
@@ -221,7 +218,7 @@ def export_generatePlot(self, reportRequest):
221
218
retVal = self .__checkPlotRequest (reportRequest )
222
219
if not retVal ["OK" ]:
223
220
return retVal
224
- reporter = MainReporter (self .__db , self .serviceInfoDict [ "clientSetup" ] )
221
+ reporter = MainReporter (self .__db , self .diracSetup )
225
222
reportRequest ["generatePlot" ] = True
226
223
return reporter .generate (reportRequest , self .getRemoteCredentials ())
227
224
@@ -245,7 +242,7 @@ def export_getReport(self, reportRequest):
245
242
retVal = self .__checkPlotRequest (reportRequest )
246
243
if not retVal ["OK" ]:
247
244
return retVal
248
- reporter = MainReporter (self .__db , self .serviceInfoDict [ "clientSetup" ] )
245
+ reporter = MainReporter (self .__db , self .diracSetup )
249
246
reportRequest ["generatePlot" ] = False
250
247
return reporter .generate (reportRequest , self .getRemoteCredentials ())
251
248
@@ -278,8 +275,7 @@ def export_addRecords(self, indexname, monitoringType, data):
278
275
:param list data: data to insert
279
276
:returns: S_OK or S_ERROR
280
277
"""
281
- setup = self .serviceInfoDict .get ("clientSetup" , "" )
282
- indexname = "%s_%s" % (setup .lower (), indexname )
278
+ indexname = "%s_%s" % (self .diracSetup .lower (), indexname )
283
279
gLogger .debug ("Bulk index:" , indexname )
284
280
mapping = self .__db .getMapping (monitoringType )
285
281
gLogger .debug ("Mapping:" , mapping )
@@ -294,8 +290,7 @@ def export_deleteIndex(self, indexName):
294
290
295
291
:param str indexName: name of the index
296
292
"""
297
- setup = self .serviceInfoDict .get ("clientSetup" , "" )
298
- indexName = "%s_%s" % (setup .lower (), indexName )
293
+ indexName = "%s_%s" % (self .diracSetup .lower (), indexName )
299
294
gLogger .debug ("delete index:" , indexName )
300
295
return self .__db .deleteIndex (indexName )
301
296
@@ -373,4 +368,6 @@ def export_pingDB(self):
373
368
374
369
375
370
class MonitoringHandler (MonitoringHandlerMixin , RequestHandler ):
376
- pass
371
+ def initialize (self ):
372
+ self .diracSetup = self .serviceInfoDict ["clientSetup" ]
373
+ return S_OK ()
0 commit comments