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 2

Check dict key get_reboot_active exists before attempting to use, not all proxy implement it

Browse source
This commit is contained in:
David Murphy 2021-05-21 14:37:39 -06:00 • committed by Gareth J. Greenaway
parent 5457218d86
commit a5d95458fe
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/status.py
View file

@ -1790,7 +1790,8 @@ def proxy_reconnect(proxy_name, opts=None):
if proxy_keepalive_fn not in __proxy__:
return False # fail
if __proxy__[proxy_name + ".get_reboot_active"]():
chk_reboot_active_key = proxy_name + ".get_reboot_active"
if chk_reboot_active_key in __proxy__ and __proxy__[chk_reboot_active_key]():
# if rebooting or shutting down, don't run proxy_reconnect
# it interferes with the connection and disrupts the shutdown/reboot
# especially