HOTFIX
This commit is contained in:
parent
08cb98cfba
commit
948f0c54dc
1 changed files with 0 additions and 5 deletions
|
|
@ -439,7 +439,6 @@ class AgentService:
|
|||
activatedCount += 1
|
||||
continue
|
||||
try:
|
||||
<<<<<<< HEAD
|
||||
from modules.serviceCenter.services.serviceAgent.coreTools import registerCoreTools
|
||||
registerCoreTools(registry, self.services)
|
||||
if registry.isValidTool(toolName):
|
||||
|
|
@ -449,9 +448,6 @@ class AgentService:
|
|||
except Exception:
|
||||
pass
|
||||
try:
|
||||
from modules.serviceCenter.services.serviceAgent.actionToolAdapter import ActionToolAdapter
|
||||
from modules.workflows.processing.core.actionExecutor import ActionExecutor
|
||||
=======
|
||||
from modules.workflows.processing.shared.methodDiscovery import discoverMethods
|
||||
from modules.workflows.processing.core.actionExecutor import ActionExecutor
|
||||
from modules.serviceCenter.services.serviceAgent.actionToolAdapter import (
|
||||
|
|
@ -459,7 +455,6 @@ class AgentService:
|
|||
)
|
||||
|
||||
discoverMethods(self.services)
|
||||
>>>>>>> origin/fix/click-up-connector
|
||||
adapter = ActionToolAdapter(ActionExecutor(self.services))
|
||||
adapter.registerAll(registry)
|
||||
if registry.isValidTool(toolName):
|
||||
|
|
|
|||
Loading…
Reference in a new issue