Merge pull request #9713 from SaveTheRbtz/fix-rekey

master: publish_session is in seconds, not minutes
This commit is contained in:
Thomas S Hatch 2014-01-13 09:16:32 -08:00
commit 7e4e333053

View File

@ -226,7 +226,7 @@ class Master(SMaster):
shutil.rmtree(f_path)
if self.opts.get('publish_session'):
if now - rotate >= self.opts['publish_session'] * 60:
if now - rotate >= self.opts['publish_session']:
salt.crypt.dropfile(self.opts['cachedir'])
rotate = now
if self.opts.get('search'):