commit 59b720c18f7407633ba7d8f731cf0d0305f9a78a
parent 4a5ae4df66bc489aada3a1af2a5726ea36aaf703
Author: chris-belcher <belcher@riseup.net>
Date: Fri, 10 Jan 2020 15:09:04 +0000
Merge pull request #172 from m-schmoock/fix/log_all_certs
Log both code path that select certificates
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electrumpersonalserver/server/common.py b/electrumpersonalserver/server/common.py
@@ -96,6 +96,7 @@ def run_electrum_server(rpc, txmonitor, config):
poll_interval_connected = int(config.get("bitcoin-rpc",
"poll_interval_connected"))
certfile, keyfile = get_certs(config)
+ logger.info('using cert: {}, key: {}'.format(certfile, keyfile))
disable_mempool_fee_histogram = config.getboolean("electrum-server",
"disable_mempool_fee_histogram", fallback=False)
broadcast_method = config.get("electrum-server", "broadcast_method",
@@ -292,7 +293,6 @@ def get_certs(config):
certfile = resource_filename('electrumpersonalserver', __certfile__)
keyfile = resource_filename('electrumpersonalserver', __keyfile__)
if os.path.exists(certfile) and os.path.exists(keyfile):
- logger.info('using cert: {}, key: {}'.format(certfile, keyfile))
return certfile, keyfile
else:
raise ValueError('invalid cert: {}, key: {}'.format(