From ea49cbc6288f5a58672bd4ba9f1f9c82350b5878 Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Tue, 27 Jan 2015 08:14:53 -0800 Subject: [PATCH] Change req_fun default to send (which is encrypted) --- salt/master.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/master.py b/salt/master.py index 26a06ec9af..73eabc4526 100644 --- a/salt/master.py +++ b/salt/master.py @@ -654,11 +654,12 @@ class MWorker(multiprocessing.Process): while True: try: 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) - # req_opts defines our response - # req_fun: default to send_clear - req_fun = req_opts.get('fun', 'send_clear') + # req_fun: default to send + req_fun = req_opts.get('fun', 'send') if req_fun == 'send_clear': self.req_channel.send_clear(ret) elif req_fun == 'send':