valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

'and' on the next line

Browse Source
This commit is contained in:
Mircea Ulinic 2017-03-31 16:29:48 +00:00
parent 3a0ca3e950
commit 31af43812d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.py
View File

@ -3208,8 +3208,8 @@ class ProxyMinion(Minion):
# proxy keepalive # proxy keepalive
proxy_alive_fn = fq_proxyname+'.alive' proxy_alive_fn = fq_proxyname+'.alive'
if (proxy_alive_fn in self.proxy if (proxy_alive_fn in self.proxy
and 'status.proxy_reconnect' in self.functions and and 'status.proxy_reconnect' in self.functions
self.opts.get('proxy_keep_alive', True)): and self.opts.get('proxy_keep_alive', True)):
# if `proxy_keep_alive` is either not specified, either set to False does not retry reconnecting # if `proxy_keep_alive` is either not specified, either set to False does not retry reconnecting
self.schedule.add_job({ self.schedule.add_job({
'__proxy_keepalive': '__proxy_keepalive':