Skip to content

Commit

Permalink
Rename git_pillar_interval to git_pillar_update_interval
Browse files Browse the repository at this point in the history
Similar to gifs_update_interval
  • Loading branch information
sathieu committed Dec 21, 2019
1 parent fdb4d39 commit 48e0dfa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions salt/master.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,18 +224,18 @@ def run(self):

# Make Start Times
last = int(time.time())
last_git_pillar = last
last_git_pillar_update = last

git_pillar_interval = self.opts.get('git_pillar_interval', 0)
git_pillar_update_interval = self.opts.get('git_pillar_update_interval', 0)
old_present = set()
while True:
now = int(time.time())
if (now - last) >= self.loop_interval:
salt.daemons.masterapi.clean_old_jobs(self.opts)
salt.daemons.masterapi.clean_expired_tokens(self.opts)
salt.daemons.masterapi.clean_pub_auth(self.opts)
if (now - last_git_pillar) >= git_pillar_interval:
last_git_pillar = now
if (now - last_git_pillar_update) >= git_pillar_update_interval:
last_git_pillar_update = now
self.handle_git_pillar()
self.handle_schedule()
self.handle_key_cache()
Expand Down

0 comments on commit 48e0dfa

Please sign in to comment.