Skip to content

Commit a316993

Browse files
committed
use dictionary rather than list for json
1 parent 4869a7c commit a316993

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/vsc/utils/zabbix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ZabbixReporter(NagiosReporter):
4444

4545
def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string, nagios_message):
4646
"""Print the zabbix report and exit"""
47-
print('[%f, "%s", %s]' % (timestamp, nagios_exit_string, nagios_message))
47+
print('{"timestamp": %f, "exit_string": "%s", "message": %s}' % (timestamp, nagios_exit_string, nagios_message))
4848
self.log.info("Zabbix check cache file %s contents delivered: %s", self.filename, nagios_message)
4949
sys.exit(nagios_exit_code)
5050

test/zabbix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_cache(self):
8787
buffer.close()
8888
self.assertTrue(err.code == nagios_exit[0])
8989
line = json.loads(line)
90-
self.assertTrue(line[1] == nagios_exit[1])
91-
self.assertTrue(line[2][0] == json.loads(message)[0])
90+
self.assertTrue(line["exit_string"] == nagios_exit[1])
91+
self.assertTrue(line["message"][0] == json.loads(message)[0])
9292

9393
os.unlink(filename)

0 commit comments

Comments
 (0)