Multimaster beacons fix: put list into a dict to fire on the bus

This commit is contained in:
Dmitry Kuzmenko 2019-08-18 12:18:34 +03:00
parent 790fb41b33
commit 8a88542b7f
No known key found for this signature in database
GPG key ID: 4C7CAD30C95651DA

View file

@ -2559,7 +2559,7 @@ class Minion(MinionBase):
elif tag.startswith('__beacons_return'):
if self.connected:
log.debug('Firing beacons to master')
self._fire_master(events=data)
self._fire_master(events=data['beacons'])
def _fallback_cleanups(self):
'''
@ -2627,7 +2627,7 @@ class Minion(MinionBase):
event = salt.utils.event.get_event('minion',
opts=self.opts,
listen=False)
event.fire_event(beacons, '__beacons_return')
event.fire_event({'beacons': beacons}, '__beacons_return')
event.destroy()
new_periodic_callbacks['beacons'] = tornado.ioloop.PeriodicCallback(