valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6884 from terminalmage/travis

Browse Source 
Fix boolean, plus other pep8 fixes
This commit is contained in:
Pedro Algarvio 2013-08-25 08:57:47 -07:00
commit 8ab65b2d47
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
salt/utils/event.py
View File

@ -81,20 +81,20 @@ SUB_EVENT = set([
'state.sls',
])
TAGEND = '\n\n' # long tag delimeter
TAGPARTER = '.' # name spaced tag delimeter
SALT = 'salt' #base prefix for all salt. events
TAGEND = '\n\n' # long tag delimeter
TAGPARTER = '.' # name spaced tag delimeter
SALT = 'salt' # base prefix for all salt. events
# dict map of namespaced base tag prefixes for salt events
TAGS = \
{
'auth': 'auth', # prefix for all .auth events
'job': 'job', # prefix for all .job events (minion jobs)
'key': 'key', # prefix for all .key events
'minion': 'minion', # prefix for all .minion events (minion sourced events)
'syndic': 'syndic', # prefix for all .syndic events (syndic minion sourced events)
'run': 'run', #prefis for all .run events (salt runners)
TAGS = {
'auth': 'auth', # prefix for all .auth events
'job': 'job', # prefix for all .job events (minion jobs)
'key': 'key', # prefix for all .key events
'minion': 'minion', # prefix for all .minion events (minion sourced events)
'syndic': 'syndic', # prefix for all .syndic events (syndic minion sourced events)
'run': 'run', # prefix for all .run events (salt runners)
}
def tagify(suffix='', prefix='', base=SALT):
'''
convenience function to build a namespaced event tag string
@ -108,12 +108,13 @@ def tagify(suffix='', prefix='', base=SALT):
'''
parts = [base, TAGS.get(prefix, prefix)]
if hasattr(suffix, 'append'): # list so extend parts
if hasattr(suffix, 'append'): # list so extend parts
parts.extend(suffix)
else: # string so append
else: # string so append
parts.append(suffix)
return (TAGPARTER.join([part for part in parts if part]))
class SaltEvent(object):
'''
The base class used to manage salt events
@ -216,15 +217,15 @@ class SaltEvent(object):
socks = dict(self.poller.poll(wait * 1000)) # convert to milliseconds
if self.sub in socks and socks[self.sub] == zmq.POLLIN:
raw = self.sub.recv()
if ord(raw[20]) >= 0x80: #old style
if ord(raw[20]) >= 0x80: # old style
mtag = raw[0:20].rstrip('|')
mdata = raw[20:]
else: #new style
mtag, sep, mdata = raw.partition(TAGEND) #split tag from data
else: # new style
mtag, sep, mdata = raw.partition(TAGEND) # split tag from data
data = self.serial.loads(mdata)
if not mtag.startswith(tag): #tag not match
if not mtag.startswith(tag): # tag not match
return None
if full:
@ -251,19 +252,19 @@ class SaltEvent(object):
Supports new style long tags.
'''
if not str(tag): #no empty tags allowed
if not str(tag): # no empty tags allowed
raise ValueError('Empty tag.')
if not isinstance(data, MutableMapping): #data must be dict
if not isinstance(data, MutableMapping): # data must be dict
raise ValueError('Dict object expected, not "{0!r}".'.format(data))
if not self.cpush:
self.connect_pull()
tagend = ""
if len(tag) <= 20: #old style compatible tag
tag = '{0:|<20}'.format(tag) #pad with pipes '|' to 20 character length
else: #new style longer than 20 chars
if len(tag) <= 20: # old style compatible tag
tag = '{0:|<20}'.format(tag) # pad with pipes '|' to 20 character length
else: # new style longer than 20 chars
tagend = TAGEND
event = '{0}{1}{2}'.format(tag, tagend, self.serial.dumps(data))
@ -306,10 +307,10 @@ class SaltEvent(object):
if data.get('result') is False:
self.fire_event(
data,
'{0}.{1}'.format(tags[0], tags[-1])) # old dup event
'{0}.{1}'.format(tags[0], tags[-1])) # old dup event
data['jid'] = load['jid']
data['id'] = load['id']
data['success'] = false
data['success'] = False
data['return'] = 'Error: {0}.{1}'.format(tags[0], tags[-1])
data['fun'] = load['fun']
self.fire_event(
@ -317,20 +318,20 @@ class SaltEvent(object):
tagify([load['jid'],
'sub',
load['id'],
'error',
load['fun']],
'error',
load['fun']],
'job'))
except Exception:
pass
else:
self.fire_event(load, load['fun']) # old dup event
self.fire_event(load, load['fun']) # old dup event
self.fire_event(load,
tagify([load['jid'],
'sub',
load['id'],
'ret',
load['fun']],
'job'))
'job'))
def __del__(self):
self.destroy()