Handle errors sending mine datas to master

Fix for #25720
saltstack · Jul 30, 2015 · fe62ce5 · fe62ce5
1 parent c5bb5bc
commit fe62ce5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/salt/minion.py b/salt/minion.py
@@ -1477,8 +1477,12 @@ def _mine_send(self, package):
         channel = salt.transport.Channel.factory(self.opts)
         load = salt.utils.event.SaltEvent.unpack(package)[1]
         load['tok'] = self.tok
-        ret = channel.send(load)
-        return ret
+        try:
+            ret = channel.send(load)
+            return ret
+        except SaltReqTimeoutError:
+            log.warning('Unable to send mine data to master.')
+            return None
 
     @tornado.gen.coroutine
     def handle_event(self, package):