[checkmk-commits] mk_jolokia: Move writing of non-error values to query_instance

Module: check_mk Branch: master Commit: 4979a7f3dbd986f6585d2c733a9f150cbe108d87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4979a7f3dbd986… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 19 19:02:29 2016 +0100 mk_jolokia: Move writing of non-error values to query_instance Change-Id: Idc81384d842ac1931e8b9a56796db007c9c28232 --- agents/plugins/mk_jolokia | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 8338213..a54a342 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -251,7 +251,7 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): else: tit = subinstance[-1] - sys.stdout.write("%s %s %s\n" % (item.replace(" ", "_"), tit, value)) + yield (item.replace(" ", "_"), tit, value) def query_instance(inst): @@ -333,7 +333,8 @@ def query_instance(inst): for inst, mbean_path, title, itemspec in queries: try: - fetch_metric(inst, mbean_path, title, itemspec) + for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, itemspec): + sys.stdout.write("%s %s %s\n" % (out_item, out_title, out_value) ) except IOError: return except socket.timeout: