jjb
/
jenkins-job-builder
Code Issues Proposed changes

Update logstash to make use of convert_mapping_to_xml() 

Change-Id: Id89503114e586339dc4ec5709eecd89b405908b7
This commit is contained in:
Yolande Amate 2017-07-03 18:05:26 +01:00
parent e3e5a8aabe
commit 657c4cc466
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jenkins_jobs/modules/wrappers.py
View File

@ -1463,34 +1463,22 @@ def logstash(registry, xml_parent, data):
'LogstashBuildWrapper') 'LogstashBuildWrapper')
logstash.set('plugin', 'logstash@0.8.0') logstash.set('plugin', 'logstash@0.8.0')
redis_bool = XML.SubElement(logstash, 'useRedis') mapping = [('use-redis', 'useRedis', True)]
redis_bool.text = str(data.get('use-redis', True)).lower() convert_mapping_to_xml(logstash, data, mapping, fail_required=True)
if data.get('use-redis'): if data.get('use-redis'):
redis_config = data.get('redis', {}) redis_config = data.get('redis', {})
redis_sub_element = XML.SubElement(logstash, 'redis') redis_sub_element = XML.SubElement(logstash, 'redis')
host_sub_element = XML.SubElement(redis_sub_element, 'host') mapping = [
host_sub_element.text = str( ('host', 'host', 'localhost'),
redis_config.get('host', 'localhost')) ('port', 'port', '6379'),
('database-number', 'numb', '0'),
port_sub_element = XML.SubElement(redis_sub_element, 'port') ('database-password', 'pass', ''),
port_sub_element.text = str(redis_config.get('port', '6379')) ('data-type', 'dataType', 'list'),
('key', 'key', 'logstash')]
database_numb_sub_element = XML.SubElement(redis_sub_element, 'numb') convert_mapping_to_xml(redis_sub_element,
database_numb_sub_element.text = \ redis_config, mapping, fail_required=True)
str(redis_config.get('database-number', '0'))
database_pass_sub_element = XML.SubElement(redis_sub_element, 'pass')
database_pass_sub_element.text = \
str(redis_config.get('database-password', ''))
data_type_sub_element = XML.SubElement(redis_sub_element, 'dataType')
data_type_sub_element.text = \
str(redis_config.get('data-type', 'list'))
key_sub_element = XML.SubElement(redis_sub_element, 'key')
key_sub_element.text = str(redis_config.get('key', 'logstash'))
def mongo_db(registry, xml_parent, data): def mongo_db(registry, xml_parent, data):