"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/master.py" between
salt-2019.2.0.tar.gz and salt-2019.2.1.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

master.py  (salt-2019.2.0):master.py  (salt-2019.2.1)
skipping to change at line 331 skipping to change at line 331
Evaluate the scheduler Evaluate the scheduler
''' '''
try: try:
self.schedule.eval() self.schedule.eval()
# Check if scheduler requires lower loop interval than # Check if scheduler requires lower loop interval than
# the loop_interval setting # the loop_interval setting
if self.schedule.loop_interval < self.loop_interval: if self.schedule.loop_interval < self.loop_interval:
self.loop_interval = self.schedule.loop_interval self.loop_interval = self.schedule.loop_interval
except Exception as exc: except Exception as exc:
log.error('Exception %s occurred in scheduled job', exc) log.error('Exception %s occurred in scheduled job', exc)
self.schedule.cleanup_subprocesses()
def handle_presence(self, old_present): def handle_presence(self, old_present):
''' '''
Fire presence events if enabled Fire presence events if enabled
''' '''
# On the first run it may need more time for the EventPublisher # On the first run it may need more time for the EventPublisher
# to come up and be ready. Set the timeout to account for this. # to come up and be ready. Set the timeout to account for this.
if self.presence_events and self.event.connect_pull(timeout=3): if self.presence_events and self.event.connect_pull(timeout=3):
present = self.ckminions.connected_ids() present = self.ckminions.connected_ids()
new = present.difference(old_present) new = present.difference(old_present)
skipping to change at line 674 skipping to change at line 675
) )
), ),
'reload': salt.crypt.Crypticle.generate_key_string 'reload': salt.crypt.Crypticle.generate_key_string
} }
log.info('Creating master process manager') log.info('Creating master process manager')
# Since there are children having their own ProcessManager we should wait for kill more time. # Since there are children having their own ProcessManager we should wait for kill more time.
self.process_manager = salt.utils.process.ProcessManager(wait_for_ki ll=5) self.process_manager = salt.utils.process.ProcessManager(wait_for_ki ll=5)
pub_channels = [] pub_channels = []
log.info('Creating master publisher process') log.info('Creating master publisher process')
log_queue = salt.log.setup.get_multiprocessing_logging_queue() log_queue = salt.log.setup.get_multiprocessing_logging_queue()
for transport, opts in iter_transport_opts(self.opts): for _, opts in iter_transport_opts(self.opts):
chan = salt.transport.server.PubServerChannel.factory(opts) chan = salt.transport.server.PubServerChannel.factory(opts)
chan.pre_fork(self.process_manager, kwargs={'log_queue': log_que ue}) chan.pre_fork(self.process_manager, kwargs={'log_queue': log_que ue})
pub_channels.append(chan) pub_channels.append(chan)
log.info('Creating master event publisher process') log.info('Creating master event publisher process')
self.process_manager.add_process(salt.utils.event.EventPublisher, ar gs=(self.opts,)) self.process_manager.add_process(salt.utils.event.EventPublisher, ar gs=(self.opts,))
if self.opts.get('reactor'): if self.opts.get('reactor'):
if isinstance(self.opts['engines'], list): if isinstance(self.opts['engines'], list):
rine = False rine = False
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)