From f587acc0958e970c36fc7e0332da2528b402b675 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Thu, 9 Sep 2021 18:06:14 -0700 Subject: [PATCH] Use typedconfig with repr function (#1255) * Use typedconfig with repr function * Pin version of typedconfig in requirements.txt --- requirements.txt | 2 +- setup.py | 1 + squeaknode/main.py | 15 +++------------ squeaknode/node/squeak_node.py | 4 ---- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 493183f2..42d44fd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,4 @@ pyzmq requests SQLAlchemy squeakpy==0.7.3 -typed-config +typed-config==0.2.5 diff --git a/setup.py b/setup.py index 978ae763..8f7f2810 100644 --- a/setup.py +++ b/setup.py @@ -120,6 +120,7 @@ setup( 'flask-cors', 'alembic', 'PySocks', + 'typed-config>=0.2.2,<2.3.0', ], extras_require={"test": ["pytest", "coverage"]}, entry_points={ diff --git a/squeaknode/main.py b/squeaknode/main.py index fb14b6ec..26b7951d 100644 --- a/squeaknode/main.py +++ b/squeaknode/main.py @@ -79,18 +79,8 @@ def main(): level = args.log_level.upper() logging.getLogger().setLevel(level) - logger.info("Starting squeaknode...") config = SqueaknodeConfig(args.config) config.read() - logger.info("config: {}".format(config)) - logger.info("bitcoin rpc host: {}, rpc port: {}, rpc user: {}, rpc pass: {}, rpc use_ssl: {}, rpc ssl cert: {}".format( - config.bitcoin.rpc_host, - config.bitcoin.rpc_port, - config.bitcoin.rpc_user, - config.bitcoin.rpc_pass, - config.bitcoin.rpc_use_ssl, - config.bitcoin.rpc_ssl_cert, - )) # Set the log level again level = config.node.log_level @@ -100,14 +90,15 @@ def main(): def run_node(config): + logger.info("Config: {}".format(config)) signal(SIGTERM, handler) signal(SIGINT, handler) signal(SIGHUP, handler) squeak_node = SqueakNode(config) - print('Starting Squeaknode...') + logger.info("Starting squeaknode...") squeak_node.start_running() stop_event.wait() - print('Shutting down Squeaknode...') + logger.info('Shutting down Squeaknode...') squeak_node.stop_running() diff --git a/squeaknode/node/squeak_node.py b/squeaknode/node/squeak_node.py index 398210e7..8c671c57 100644 --- a/squeaknode/node/squeak_node.py +++ b/squeaknode/node/squeak_node.py @@ -54,10 +54,6 @@ class SqueakNode: self.config = config def _initialize(self): - # Print some configs - logger.info("Config server rpc port: {}".format( - self.config.server.rpc_port)) - self.initialize_network() self.initialize_db() self.initialize_lightning_client()