The fixes by cachedout which were backported into 2015_2 were missing a single parameter thus not setting up the TCP keepalive for the ZeroMQ Channel by default.

This commit is contained in:
Teizz 2015-05-01 17:46:47 +02:00
parent 8de3c83956
commit 0b9fb6f9be

View file

@ -217,7 +217,7 @@ class ZeroMQChannel(Channel):
log.debug('Removed obsolete sreq-object from '
'sreq_cache for master {0}'.format(check_key[0]))
ZeroMQChannel.sreq_cache[key] = salt.payload.SREQ(self.master_uri)
ZeroMQChannel.sreq_cache[key] = salt.payload.SREQ(self.master_uri, opts=self.opts)
return ZeroMQChannel.sreq_cache[key]