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

Fix whitespace and formatting in couchdb returner

Browse Source
This commit is contained in:
Colton Myers 2013-08-07 16:40:08 -06:00
parent 3bd5156a27
commit fbd2022ef7
1 changed files with 85 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
salt/returners/couchdb_return.py
View File

@ -13,6 +13,7 @@ import json
log = logging.getLogger(__name__)
def __virtual__():
return 'couchdb'
@ -52,21 +53,23 @@ def _generate_doc(ret, options):
return r
def _request(method, url, content_type=None, _data=None):
'''
Makes a HTTP request. Returns the JSON parse, or an obj with an error.
'''
opener = urllib2.build_opener(urllib2.HTTPHandler)
request = urllib2.Request( url, data=_data)
opener = urllib2.build_opener(urllib2.HTTPHandler)
request = urllib2.Request(url, data=_data)
if content_type:
request.add_header('Content-Type', content_type)
request.get_method = lambda: method
request.get_method = lambda: method
try:
handler = opener.open(request)
handler = opener.open(request)
except urllib2.HTTPError as e:
return {'error': '{0}'.format(e) }
return {'error': '{0}'.format(e)}
return json.loads(handler.read())
def returner(ret):
'''
Take in the return and shove it into the couchdb database.
@ -75,26 +78,30 @@ def returner(ret):
options = _get_options()
# Check to see if the database exists.
_response = _request( "GET", options['url'] + "_all_dbs" )
_response = _request("GET", options['url'] + "_all_dbs")
if options['db'] not in _response:
# Make a PUT request to create the database.
_response = _request( "PUT", options['url'] + options['db'] )
_response = _request("PUT", options['url'] + options['db'])
# Confirm that the response back was simple 'ok': true.
if not 'ok' in _response or _response['ok'] != True:
return log.error( 'Unable to create database "{0}"'.format(options['db']) )
log.info( 'Created database "{0}"'.format(options['db']) )
if not 'ok' in _response or _response['ok'] is not True:
return log.error('Unable to create database "{0}"'
.format(options['db']))
log.info('Created database "{0}"'.format(options['db']))
# Call _generate_doc to get a dict object of the document we're going to
# Call _generate_doc to get a dict object of the document we're going to
# shove into the database.
doc = _generate_doc(ret, options)
# Make the actual HTTP PUT request to create the doc.
_response = _request( "PUT", options['url'] + options['db'] + "/" + doc['_id'], 'application/json', json.dumps(doc) )
_response = _request("PUT",
options['url'] + options['db'] + "/" + doc['_id'],
'application/json',
json.dumps(doc))
# Santiy check regarding the response..
if not 'ok' in _response or _response['ok'] != True:
if not 'ok' in _response or _response['ok'] is not True:
log.error('Unable to create document: "{0}"'.format(_response))
@ -103,11 +110,11 @@ def get_jid(jid):
Get the document with a given JID.
'''
options = _get_options()
_response = _request( "GET", options['url'] + options['db'] + '/' + jid )
_response = _request("GET", options['url'] + options['db'] + '/' + jid)
if 'error' in _response:
log.error('Unable to get JID "{0}" : "{1}"'.format(jid, _response))
return {}
return { _response['id']: _response }
return {_response['id']: _response}
def get_jids():
@ -115,29 +122,32 @@ def get_jids():
List all the jobs that we have..
'''
options = _get_options()
_response = _request( "GET", options['url'] + options['db'] + "/_all_docs" )
_response = _request("GET", options['url'] + options['db'] + "/_all_docs")
# Make sure the 'total_rows' is returned.. if not error out.
if not 'total_rows' in _response:
log.error('Didn\'t get valid response from requesting all docs: {0}'.format(_response))
log.error('Didn\'t get valid response from requesting all docs: {0}'
.format(_response))
return []
# Return the rows.
ret = []
for row in _response['rows']:
# Because this shows all the documents in the database, including the design documents,
# whitelist the matching salt jid's which is a 20 digit int.
# Because this shows all the documents in the database, including the
# design documents, whitelist the matching salt jid's which is a 20
# digit int.
# See if the identifier is an int..
try:
_id = int( row['id'] )
except Exception as exp:
int(row['id'])
except Exception:
continue
# Check the correct number of digits by simply casting to str and splitting.
# Check the correct number of digits by simply casting to str and
# splitting.
if len(str(row['id'])) == 20:
ret.append( row['id'] )
ret.append(row['id'])
return ret
@ -151,20 +161,32 @@ def get_fun(fun):
options = _get_options()
# Define a simple return object.
_ret = { }
_ret = {}
# get_minions takes care of calling ensure_views for us.
# For each minion we know about
for minion in get_minions():
# Make a query of the by-minion-and-timestamp view and limit the count to 1.
_response = _request( "GET", options['url'] + options['db'] + '/_design/salt/_view/by-minion-fun-timestamp?descending=true&endkey=["{0}","{1}",0]&startkey=["{2}","{3}",9999999999]&limit=1'.format(minion,fun,minion,fun) )
# Make a query of the by-minion-and-timestamp view and limit the count
# to 1.
_response = _request("GET",
options['url'] +
options['db'] +
('/_design/salt/_view/by-minion-fun-times'
'tamp?descending=true&endkey=["{0}","{1}'
'",0]&startkey=["{2}","{3}",9999999999]&'
'limit=1').format(minion,
fun,
minion,
fun))
# Skip the minion if we got an error..
if 'error' in _response:
log.warning( 'Got an error when querying for last command by a minion: {0}'.format(_response['error']))
log.warning('Got an error when querying for last command by a '
'minion: {0}'.format(_response['error']))
continue
# Skip the minion if we didn't get any rows back. ( IE function that they're looking for has a typo in it or some such ).
# Skip the minion if we didn't get any rows back. ( IE function that
# they're looking for has a typo in it or some such ).
if len(_response['rows']) < 1:
continue
@ -181,21 +203,24 @@ def get_minions():
options = _get_options()
# Make sure the views are valid, which includes the minions..
if not ensure_views( ):
if not ensure_views():
return []
# Make the request for the view..
_response = _request( "GET", options['url'] + options['db'] + "/_design/salt/_view/minions?group=true" )
_response = _request("GET",
options['url'] +
options['db'] +
"/_design/salt/_view/minions?group=true")
# Verify that we got a response back.
if not 'rows' in _response:
log.error('Unable to get available minions: {0}'.format(_response))
return []
# Iterate over the rows to build up a list return it.
_ret = [ ]
_ret = []
for row in _response['rows']:
_ret.append( row['key'] )
_ret.append(row['key'])
return _ret
@ -209,38 +234,44 @@ def ensure_views():
options = _get_options()
# Make a request to check if the design document exists.
_response = _request( "GET", options['url'] + options['db'] + "/_design/salt" )
_response = _request("GET",
options['url'] + options['db'] + "/_design/salt")
# If the document doesn't exist, or for some reason there are not views.
if 'error' in _response:
return set_salt_view( )
return set_salt_view()
# Determine if any views are missing from the design doc stored on the server..
# If we come across one, simply set the salt view and return out. set_salt_view
# will set all the views, so we don't need to continue t check.
# Determine if any views are missing from the design doc stored on the
# server.. If we come across one, simply set the salt view and return out.
# set_salt_view will set all the views, so we don't need to continue t
# check.
for view in get_valid_salt_views():
if not view in _response['views']:
return set_salt_view( )
return set_salt_view()
# Valid views, return true.
return True
def get_valid_salt_views():
'''
Returns a dict object of views that should be
part of the salt design document.
'''
ret = { }
ret = {}
ret['minions'] = { }
ret['minions'] = {}
ret['minions']['map'] = "function( doc ){ emit( doc.id, null ); }"
ret['minions']['reduce'] = "function( keys,values,rereduce ){ return key[0]; }"
ret['minions']['reduce'] = \
"function( keys,values,rereduce ){ return key[0]; }"
ret['by-minion-fun-timestamp'] = { }
ret['by-minion-fun-timestamp']['map'] = "function( doc ){ emit( [doc.id,doc.fun,doc.timestamp], doc ); }"
ret['by-minion-fun-timestamp'] = {}
ret['by-minion-fun-timestamp']['map'] = \
"function( doc ){ emit( [doc.id,doc.fun,doc.timestamp], doc ); }"
return ret
def set_salt_view( ):
def set_salt_view():
'''
Helper function that sets the salt design
document. Uses get_valid_salt_views and some hardcoded values.
@ -249,13 +280,16 @@ def set_salt_view( ):
options = _get_options()
# Create the new object that we will shove in as the design doc.
new_doc = { }
new_doc['views'] = get_valid_salt_views( )
new_doc = {}
new_doc['views'] = get_valid_salt_views()
new_doc['language'] = "javascript"
# Make the request to update the design doc.
_response = _request( "PUT", options['url'] + options['db'] + "/_design/salt", "application/json", json.dumps(new_doc) )
_response = _request("PUT",
options['url'] + options['db'] + "/_design/salt",
"application/json", json.dumps(new_doc))
if 'error' in _response:
log.warning( "Unable to set the salt design document: {0}".format( _response['error'] ) )
log.warning("Unable to set the salt design document: {0}"
.format(_response['error']))
return False
return True