36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From b276ee7373e88d05c01912a9d9d3a44a5d17bab6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Wallace <danielwallace@gtmanfred.com>
|
||
|
|
Date: Mon, 13 Aug 2018 13:55:37 -0500
|
||
|
|
Subject: [PATCH] fix async call to process manager
|
||
|
|
|
||
|
|
---
|
||
|
|
salt/minion.py | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/salt/minion.py b/salt/minion.py
|
||
|
|
index 9c05a646ea..8b8fd797d1 100644
|
||
|
|
--- a/salt/minion.py
|
||
|
|
+++ b/salt/minion.py
|
||
|
|
@@ -923,7 +923,7 @@ class MinionManager(MinionBase):
|
||
|
|
install_zmq()
|
||
|
|
self.io_loop = ZMQDefaultLoop.current()
|
||
|
|
self.process_manager = ProcessManager(name='MultiMinionProcessManager')
|
||
|
|
- self.io_loop.spawn_callback(self.process_manager.run, **{'async': True}) # Tornado backward compat
|
||
|
|
+ self.io_loop.spawn_callback(self.process_manager.run, **{'asynchronous': True}) # Tornado backward compat
|
||
|
|
|
||
|
|
def __del__(self):
|
||
|
|
self.destroy()
|
||
|
|
@@ -1120,7 +1120,7 @@ class Minion(MinionBase):
|
||
|
|
time.sleep(sleep_time)
|
||
|
|
|
||
|
|
self.process_manager = ProcessManager(name='MinionProcessManager')
|
||
|
|
- self.io_loop.spawn_callback(self.process_manager.run, **{'async': True})
|
||
|
|
+ self.io_loop.spawn_callback(self.process_manager.run, **{'asynchronous': True})
|
||
|
|
# We don't have the proxy setup yet, so we can't start engines
|
||
|
|
# Engines need to be able to access __proxy__
|
||
|
|
if not salt.utils.platform.is_proxy():
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|
||
|
|
|