|
25 | 25 | from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
|
26 | 26 | from DIRAC.AccountingSystem.Client.Types.Pilot import Pilot as PilotAccounting
|
27 | 27 | from DIRAC.AccountingSystem.Client.Types.PilotSubmission import PilotSubmission as PilotSubmissionAccounting
|
| 28 | +from DIRAC.MonitoringSystem.Client.Types.PilotMonitoring import PilotMonitoring as PilotSubmissionMonitoring |
28 | 29 | from DIRAC.AccountingSystem.Client.DataStoreClient import gDataStoreClient
|
29 | 30 | from DIRAC.WorkloadManagementSystem.Client import PilotStatus
|
30 | 31 | from DIRAC.WorkloadManagementSystem.Client.MatcherClient import MatcherClient
|
@@ -88,8 +89,6 @@ def __init__(self, *args, **kwargs):
|
88 | 89 | self.sendAccounting = True
|
89 | 90 | self.sendSubmissionAccounting = True
|
90 | 91 | self.sendSubmissionMonitoring = True
|
91 |
| - wgwg |
92 |
| - |
93 | 92 | self.siteClient = None
|
94 | 93 | self.rssClient = None
|
95 | 94 | self.rssFlag = None
|
@@ -194,6 +193,9 @@ def beginExecution(self):
|
194 | 193 | self.sendSubmissionAccounting = self.am_getOption(
|
195 | 194 | "SendPilotSubmissionAccounting", self.sendSubmissionAccounting
|
196 | 195 | )
|
| 196 | + self.sendSubmissionMonitoring = self.am_getOption( |
| 197 | + "SendPiolotSubmissionMonitoring", self.sendSubmissionMonitoring |
| 198 | + ) |
197 | 199 |
|
198 | 200 | # Get the site description dictionary
|
199 | 201 | siteNames = None
|
@@ -272,6 +274,8 @@ def beginExecution(self):
|
272 | 274 | self.log.always("Pilot accounting sending requested")
|
273 | 275 | if self.sendSubmissionAccounting:
|
274 | 276 | self.log.always("Pilot submission accounting sending requested")
|
| 277 | + if self.sendSubmissionMonitoring: |
| 278 | + self.log.always("Pilot submission monitoring sending requested") |
275 | 279 |
|
276 | 280 | self.log.always("MaxPilotsToSubmit:", self.maxPilotsToSubmit)
|
277 | 281 |
|
|
0 commit comments