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

Fix calls to send() to not specify a callback of int

Browse Source
This commit is contained in:
Thomas Jackson 2015-04-02 08:45:42 -07:00
parent ec4a777c37
commit 02995a1055
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/transport/zeromq.py
View File

@ -82,7 +82,7 @@ class AsyncZeroMQReqChannel(salt.transport.client.ReqChannel):
def crypted_transfer_decode_dictentry(self, load, dictkey=None, tries=3, timeout=60): def crypted_transfer_decode_dictentry(self, load, dictkey=None, tries=3, timeout=60):
if not self.auth.authenticated: if not self.auth.authenticated:
yield self.auth.authenticate() yield self.auth.authenticate()
ret = yield self.message_client.send(self._package_load(self.auth.crypticle.dumps(load)), tries, timeout) ret = yield self.message_client.send(self._package_load(self.auth.crypticle.dumps(load)), timeout=timeout)
key = self.auth.get_keys() key = self.auth.get_keys()
aes = key.private_decrypt(ret['key'], 4) aes = key.private_decrypt(ret['key'], 4)
pcrypt = salt.crypt.Crypticle(self.opts, aes) pcrypt = salt.crypt.Crypticle(self.opts, aes)
@ -99,8 +99,7 @@ class AsyncZeroMQReqChannel(salt.transport.client.ReqChannel):
@tornado.gen.coroutine @tornado.gen.coroutine
def _do_transfer(): def _do_transfer():
data = yield self.message_client.send(self._package_load(self.auth.crypticle.dumps(load)), data = yield self.message_client.send(self._package_load(self.auth.crypticle.dumps(load)),
tries, timeout=timeout,
timeout,
) )
# we may not have always data # we may not have always data
# as for example for saltcall ret submission, this is a blind # as for example for saltcall ret submission, this is a blind