From 742c70b99c953945f9e430b3f5ae0a115c9f882a Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 22 Feb 2022 08:30:52 +0300 Subject: [PATCH] Orc 2 Agent -> list --- Sources/pyOpenRPA/Orchestrator/Managers/Process.py | 5 ++--- Sources/pyOpenRPA/Orchestrator/ServerSettings.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Sources/pyOpenRPA/Orchestrator/Managers/Process.py b/Sources/pyOpenRPA/Orchestrator/Managers/Process.py index 4969d391..4248fde3 100644 --- a/Sources/pyOpenRPA/Orchestrator/Managers/Process.py +++ b/Sources/pyOpenRPA/Orchestrator/Managers/Process.py @@ -381,8 +381,7 @@ class Process(): lLogBool = False lActivityItemUserProcessList = __Orchestrator__.ProcessorActivityItemCreate(inDef="ProcessWOExeUpperUserListGet") #self.MuteWait() - lMuteWorkBool = False - if self.mAgentMuteBool==False: self.mAgentMuteBool=True; lMuteWorkBool=True + self.mAgentMuteBool=True lGUIDStr = __Orchestrator__.AgentActivityItemAdd(inHostNameStr=self.mAgentHostNameStr,inUserStr=self.mAgentUserNameStr,inActivityItemDict=lActivityItemUserProcessList) lUserProcessList = __Orchestrator__.AgentActivityItemReturnGet(inGUIDStr=lGUIDStr) if self.mProcessNameWOExeStr.upper() in lUserProcessList: @@ -397,7 +396,7 @@ class Process(): if self.mStatusStr is None: self.mStatusStr = "0_STOPPED"; lLogBool=True # Log info about process if lLogBool == True: self.StatusChangeLog() - if lMuteWorkBool==True: self.mAgentMuteBool = False + self.mAgentMuteBool = False return self.mStatusStr def StatusCheckStart(self): """ diff --git a/Sources/pyOpenRPA/Orchestrator/ServerSettings.py b/Sources/pyOpenRPA/Orchestrator/ServerSettings.py index 6ca13be4..be8011eb 100644 --- a/Sources/pyOpenRPA/Orchestrator/ServerSettings.py +++ b/Sources/pyOpenRPA/Orchestrator/ServerSettings.py @@ -345,7 +345,7 @@ def pyOpenRPA_Agent_O2A(inRequest, inGSettings): lReturnActivityItemDict = None # If lInput['ActivityLastGUIDStr'] is '' > return 0 element for send in Agent if lInput['ActivityLastGUIDStr'] == "": - lReturnActivityItemDict = lThisAgentDict["ActivityList"][0] + lReturnActivityItemList=lQueueList # 2022 02 21 - Maslov Return list - not one item else: # go from the end - search element with GUIDStr lForTriggerGetNextItem = False @@ -356,9 +356,9 @@ def pyOpenRPA_Agent_O2A(inRequest, inGSettings): #break if lForActivityItemDict['GUIDStr'] == lInput['ActivityLastGUIDStr']: lForTriggerGetNextItem = True # CASE if GUID is not detected - return 0 element - if lReturnActivityItemDict == None and lForTriggerGetNextItem == False: - lReturnActivityItemDict = lThisAgentDict["ActivityList"][0] - lReturnActivityItemList.append(lReturnActivityItemDict) # 2022 02 21 - Maslov Return list - not one item + if (len(lQueueList)==1 and lQueueList[0]['GUIDStr'] != lInput['ActivityLastGUIDStr']): + #lReturnActivityItemDict = lThisAgentDict["ActivityList"][0] + lReturnActivityItemList=lQueueList # 2022 02 21 - Maslov Return list - not one item # Send QUEUE ITEM if len(lReturnActivityItemList) > 0: lReturnActivityItemList = copy.deepcopy(lReturnActivityItemList)