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

safer lookup of master_type

Browse Source
This commit is contained in:
Volker Schwicking 2014-07-03 21:17:45 +02:00
parent 6dcad5f65c
commit bd35eb77b9
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/transport/__init__.py
View File

@ -148,7 +148,8 @@ class ZeroMQChannel(Channel):
key = self.sreq_key
if key not in ZeroMQChannel.sreq_cache:
if self.opts['master_type'] == 'failover':
master_type = self.opts.get('master_type', None)
if master_type == 'failover':
# remove all cached sreqs to the old master to prevent
# zeromq from reconnecting to old masters automagically
for check_key in self.sreq_cache.keys():