saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Topology and jid changes wrecked job cleaning, fixed

Browse source
This commit is contained in:
Thomas S Hatch 2011-05-30 15:25:03 -06:00
parent b0fe7c8647
commit 23051825e8
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/master.py
View file

@ -38,25 +38,26 @@ class Master(object):
'''
Clean out the old jobs
'''
if self.opts['keep_jobs'] == 0:
return
diff = self.opts['keep_jobs'] * 60 * 60
keep = int(time.time()) - diff
jid_root = os.path.join(self.opts['cachedir'], 'jobs')
for jid in os.listdir(jid_root):
if int(jid.split('.')[0]) < keep:
shutil.rmtree(os.path.join(jid_root, jid))
while True:
cur = datetime.datetime.strftime(
datetime.datetime.now(), '%Y%m%d%H'
)
if self.opts['keep_jobs'] == 0:
return
jid_root = os.path.join(self.opts['cachedir'], 'jobs')
for jid in os.listdir(jid_root):
if int(cur) - int(jid[:10]) > self.opts['keep_jobs']:
shutil.rmtree(os.path.join(jid_root, jid))
time.sleep(60)
def start(self):
'''
Turn on the master server components
'''
log.info('Starting the Salt Master')
multiprocessing.Process(target=self._clear_old_jobs).start()
reqserv = ReqServer(self.opts)
reqserv.run()
while True:
self._clear_old_jobs()
time.sleep(60)
class Publisher(multiprocessing.Process):