|
40 | 40 | from DIRAC.Core.Utilities.DErrno import cmpError
|
41 | 41 | from DIRAC.Core.Utilities.ProcessPool import ProcessPool
|
42 | 42 | from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
|
43 |
| -from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor |
44 | 43 | from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient
|
45 | 44 | from DIRAC.RequestManagementSystem.private.RequestTask import RequestTask
|
46 | 45 |
|
@@ -265,23 +264,11 @@ def initialize(self):
|
265 | 264 | if self.__rmsMonitoring:
|
266 | 265 | self.rmsMonitoringReporter = MonitoringReporter(monitoringType="RMSMonitoring")
|
267 | 266 | gThreadScheduler.addPeriodicTask(100, self.__rmsMonitoringReporting)
|
268 |
| - else: |
269 |
| - # # common monitor activity |
270 |
| - gMonitor.registerActivity("Iteration", "Agent Loops", "RequestExecutingAgent", "Loops/min", gMonitor.OP_SUM) |
271 |
| - gMonitor.registerActivity( |
272 |
| - "Processed", "Request Processed", "RequestExecutingAgent", "Requests/min", gMonitor.OP_SUM |
273 |
| - ) |
274 |
| - gMonitor.registerActivity( |
275 |
| - "Done", "Request Completed", "RequestExecutingAgent", "Requests/min", gMonitor.OP_SUM |
276 |
| - ) |
277 | 267 |
|
278 | 268 | # # create request dict
|
279 | 269 | self.__requestCache = dict()
|
280 | 270 |
|
281 |
| - # ?? Probably should be removed |
282 |
| - self.FTSMode = self.am_getOption("FTSMode", False) |
283 |
| - |
284 |
| - return S_OK() |
| 271 | + return S_OK() |
285 | 272 |
|
286 | 273 | def execute(self):
|
287 | 274 | """read requests from RequestClient and enqueue them into ProcessPool"""
|
|
0 commit comments