Add returners to multi returns

2024-11-08 09:23:56 +00:00 · 2011-04-16 15:58:39 -06:00 · 2011-04-16 15:58:39 -06:00 · cdd1ea8d82
commit cdd1ea8d82
parent 8a8c4c99b5
1 changed files with 8 additions and 1 deletions
--- a/salt/minion.py
+++ b/salt/minion.py
@ -297,7 +297,14 @@ class Minion(object):
                        + ' exception: ' + str(exc))
                ret['return'][data['fun'][ind]] = exc
            ret['jid'] = data['jid']
-        self._return_pub(ret)
+        if data['ret']:
+            try:
+                self.returners[data['ret']](ret)
+            except Exception as exc:
+                self.opts['logger'].error('The return failed for job'\
+                    + data['jid'] + ' ' + exc)
+        else:
+            self._return_pub(ret)

    def _return_pub(self, ret):
        '''