x/python-surveilclient
Code Issues Proposed changes

Handle none attributes

Browse Source 
Change-Id: I5fa486bff26c5537dd933dd34328274d3b082552
This commit is contained in:
aviau 2015-05-11 13:01:50 -04:00
parent afd68d0c77
commit 8a87f7937d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
surveilclient/v2_0/shell.py
View File

@ -250,11 +250,12 @@ def do_status_host_list(sc, args):
]
formatters = {
'host_name': lambda x: x['host_name'],
'address': lambda x: x['address'],
'state': lambda x: x['state'],
'last_check': lambda x: x['last_check'],
'plugin_output': lambda x: x['plugin_output'][0:30] + '...',
'host_name': lambda x: x.get('host_name', ''),
'address': lambda x: x.get('address', ''),
'state': lambda x: x.get('state', ''),
'last_check': lambda x: x.get('last_check', ''),
'plugin_output': lambda x: x.get('plugin_output',
'')[0:30] + '...',
}
utils.print_list(services, cols, formatters=formatters)
@ -275,10 +276,10 @@ def do_status_service_list(sc, args):
]
formatters = {
'host_name': lambda x: x['host_name'],
'service_description': lambda x: x['service_description'],
'state': lambda x: x['state'],
'last_check': lambda x: x['last_check'],
'plugin_output': lambda x: x['plugin_output'][0:30] + '...',
'host_name': lambda x: x.get('host_name', ''),
'service_description': lambda x: x.get('service_description', ''),
'state': lambda x: x.get('state', ''),
'last_check': lambda x: x.get('last_check', ''),
'plugin_output': lambda x: x.get('plugin_output', '')[0:30],
}
utils.print_list(services, cols, formatters=formatters)