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

Fix jid generation issue

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-07 14:22:32 -07:00
parent 836bed4b62
commit 2a12f05b1c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/master.py
View file

@ -144,7 +144,7 @@ class ReqServer(threading.Thread):
os.makedirs(jid)
pickle.dump(load, open(os.path.join(jid_dir, 'load.p')))
else:
return self._gen_jid(load)
return self._prep_jid(load)
return jid
def _handle_payload(self, payload):
@ -208,19 +208,19 @@ class ReqServer(threading.Thread):
'''
This method sends out publications to the minions
'''
jid = self._gen_jid()
if not load['key'] == self.key:
return False
return ''
jid = self._prep_jid()
payload = {'enc': 'aes'}
load = {
'fun': load['fun'],
'arg': load['arg'],
'tgt': load['tgt'],
'jid': self._prep_jid(load),
'jid': jid,
}
payload['load'] = self.crypticle.dumps(load)
self.publisher.publish(salt.payload.package(payload))
return True
return jid
def run(self):
'''