valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include PR https://github.com/saltstack/salt/pull/46267

Browse Source
This commit is contained in:
Gareth J. Greenaway 2018-03-01 09:55:42 -08:00
parent 4f24c546e3
commit 701c7f90b4
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/utils/schedule.py
View File

@ -135,7 +135,8 @@ class Schedule(object):
def _get_schedule(self,
include_opts=True,
include_pillar=True):
include_pillar=True,
remove_hidden=False):
'''
Return the schedule data structure
'''
@ -150,6 +151,13 @@ class Schedule(object):
if not isinstance(opts_schedule, dict):
raise ValueError('Schedule must be of type dict.')
schedule.update(opts_schedule)
if remove_hidden:
_schedule = copy.deepcopy(schedule)
for job in _schedule:
for item in _schedule[job]:
if item.startswith('_'):
del schedule[job][item]
return schedule
def _check_max_running(self, func, data, opts, now):
@ -215,7 +223,8 @@ class Schedule(object):
schedule_conf = os.path.join(minion_d_dir, '_schedule.conf')
log.debug('Persisting schedule')
schedule_data = self._get_schedule(include_pillar=False)
schedule_data = self._get_schedule(include_pillar=False,
remote_hidden=True)
try:
with salt.utils.files.fopen(schedule_conf, 'wb+') as fp_:
fp_.write(
@ -1392,7 +1401,7 @@ class Schedule(object):
log.debug('Sommething went wrong')
continue
seconds = (data['_next_fire_time'] - now).total_seconds()
seconds = int((data['_next_fire_time'] - now).total_seconds())
if 'splay' in data:
# Got "splay" configured, make decision to run a job based on that