From 88e027bebd255c8c5807c05144eca2bce4345633 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Wed, 24 Jul 2019 13:40:00 +0200 Subject: [PATCH] Plugin bitcoind_: demystify "autoconf" handling --- plugins/currency/bitcoin/bitcoind_ | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/currency/bitcoin/bitcoind_ b/plugins/currency/bitcoin/bitcoind_ index bd8498c0..9963a8ee 100755 --- a/plugins/currency/bitcoin/bitcoind_ +++ b/plugins/currency/bitcoin/bitcoind_ @@ -118,16 +118,20 @@ def main(): username=bitcoin_options.rpcuser, password=bitcoin_options.rpcpassword) - (info, error) = bitcoin.getinfo() + (info, connect_error) = bitcoin.getinfo() + if connect_error: + error = "Could not connect to Bitcoin server: {}".format(connect_error) + + if command == 'autoconf': + if error: + print('no ({})'.format(error)) + else: + print('yes') + return True if error: - if command == 'autoconf': - print('no') - return True - else: - # TODO: Better way to report errors to Munin-node. - print("Could not connect to Bitcoin server.", file=sys.stderr) - return False + print(error, file=sys.stderr) + return False if request_var in ('transactions', 'block_age'): (info, error) = bitcoin.getblockhash(info['blocks']) @@ -140,10 +144,6 @@ def main(): if memory_pool: info['waiting'] = len(memory_pool) - if command == 'autoconf': - print('yes') - return True - for label in line_labels: print("%s.value %s" % (label, info[label]))