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

Change req_fun default to send (which is encrypted)

Browse Source
This commit is contained in:
Thomas Jackson 2015-01-27 08:14:53 -08:00
parent 422d1c28a3
commit ea49cbc628
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/master.py
View File

@ -654,11 +654,12 @@ class MWorker(multiprocessing.Process):
while True: while True:
try: try:
payload = self.req_channel.recv() payload = self.req_channel.recv()
# TODO: maybe change into a wrapper class?
# req_opts defines our response function
ret, req_opts = self._handle_payload(payload) ret, req_opts = self._handle_payload(payload)
# req_opts defines our response # req_fun: default to send
# req_fun: default to send_clear req_fun = req_opts.get('fun', 'send')
req_fun = req_opts.get('fun', 'send_clear')
if req_fun == 'send_clear': if req_fun == 'send_clear':
self.req_channel.send_clear(ret) self.req_channel.send_clear(ret)
elif req_fun == 'send': elif req_fun == 'send':