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

Set a minimum HWM because we don't want pup-sub to be durable

Browse Source
This commit is contained in:
Thomas S Hatch 2012-04-18 13:14:45 -06:00
parent 10aa9eb3c4
commit 3d584cd229
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -132,7 +132,10 @@ class Master(SMaster):
continue
with open(jid_file, 'r') as fn_:
jid = fn_.read()
if int(cur) - int(jid[:10]) > self.opts['keep_jobs']:
if len(jid) < 18:
# Invalid jid, scrub the dir
shutil.rmtree(f_path)
elif int(cur) - int(jid[:10]) > self.opts['keep_jobs']:
shutil.rmtree(f_path)
try:
time.sleep(60)
@ -202,6 +205,7 @@ class Publisher(multiprocessing.Process):
'''
context = zmq.Context(1)
pub_sock = context.socket(zmq.PUB)
pub_sock.setsockopt(zmq.HWM, 1)
pull_sock = context.socket(zmq.PULL)
pub_uri = 'tcp://{0[interface]}:{0[publish_port]}'.format(self.opts)
pull_uri = 'ipc://{0}'.format(