Skip to content

Commit 02d27a4

Browse files
committed
fix: removed unused flag
1 parent 56ad81d commit 02d27a4

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

src/DIRAC/Core/Base/AgentModule.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,5 +456,4 @@ def __activityMonitoringReporting(self):
456456
457457
:return: True / False
458458
"""
459-
result = self.activityMonitoringReporter.commit()
460-
return result["OK"]
459+
return self.activityMonitoringReporter.commit()["OK"]

src/DIRAC/RequestManagementSystem/Agent/RequestExecutingAgent.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
from DIRAC.Core.Utilities.DErrno import cmpError
4141
from DIRAC.Core.Utilities.ProcessPool import ProcessPool
4242
from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
43-
from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
4443
from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient
4544
from DIRAC.RequestManagementSystem.private.RequestTask import RequestTask
4645

@@ -265,23 +264,11 @@ def initialize(self):
265264
if self.__rmsMonitoring:
266265
self.rmsMonitoringReporter = MonitoringReporter(monitoringType="RMSMonitoring")
267266
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-
)
277267

278268
# # create request dict
279269
self.__requestCache = dict()
280270

281-
# ?? Probably should be removed
282-
self.FTSMode = self.am_getOption("FTSMode", False)
283-
284-
return S_OK()
271+
return S_OK()
285272

286273
def execute(self):
287274
"""read requests from RequestClient and enqueue them into ProcessPool"""

0 commit comments

Comments
 (0)