saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add back reporting of failed sub-proxies

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-05-17 01:04:14 -07:00 • committed by Gareth J. Greenaway
parent 094c2c16d8
commit ca241b75d4
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/metaproxy/deltaproxy.py
View file

@ -350,9 +350,16 @@ def post_master_init(self, master):
self.utils,
)
)
results = yield salt.ext.tornado.gen.multi(waitfor)
try:
results = yield salt.ext.tornado.gen.multi(waitfor)
except Exception as exc: # pylint: disable=broad-except
log.error("Errors loading sub proxies")
_failed = self.opts["proxy"].get("ids", [])
for sub_proxy_data in results:
minion_id = sub_proxy_data["proxy_opts"].get("id")
_failed.remove(minion_id)
if sub_proxy_data["proxy_minion"]:
self.deltaproxy_opts[minion_id] = sub_proxy_data["proxy_opts"]

1
salt/metaproxy/proxy.py
View file

@ -54,6 +54,7 @@ from salt.utils.process import SignalHandlingProcess, default_signals
log = logging.getLogger(__name__)
@salt.ext.tornado.gen.coroutine
def post_master_init(self, master):
"""