From 1e05a0cc446a48b81a502d650ca5d24764fd332f Mon Sep 17 00:00:00 2001 From: iwehf Date: Tue, 4 Jun 2024 14:45:17 +0800 Subject: [PATCH 1/2] log abstract config file path in app --- src/app/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/main.py b/src/app/main.py index 84562db1..733a36e3 100644 --- a/src/app/main.py +++ b/src/app/main.py @@ -303,7 +303,7 @@ def app_state_changed(reason): if system_name == "Darwin": resdir = os.path.join(os.path.dirname(app_path), "Resources") - config_file_path = os.path.join(resdir, "config", "config.yml") + config_file_path = os.path.abspath(os.path.join(resdir, "config", "config.yml")) os.environ["CRYNUX_SERVER_CONFIG"] = config_file_path _logger.debug(f"Config file path on mac: {config_file_path}") @@ -326,7 +326,7 @@ def app_state_changed(reason): crynux_config.dump_config(cfg) elif system_name == "Windows": - config_file_path = os.path.join("config", "config.yml") + config_file_path = os.path.abspath(os.path.join("config", "config.yml")) os.environ["CRYNUX_SERVER_CONFIG"] = config_file_path _logger.debug(f"Config file path on windows: {config_file_path}") @@ -339,7 +339,7 @@ def app_state_changed(reason): index = __file__.rfind(os.path.sep + "src") root_dir = __file__[:index] - config_file_path = os.path.join(root_dir, "config", "config.yml") + config_file_path = os.path.abspath(os.path.join(root_dir, "config", "config.yml")) os.environ["CRYNUX_SERVER_CONFIG"] = config_file_path _logger.debug(f"Config file path from source: {config_file_path}") From 7c2a9c64d97d0c222725fcfe673fee32d20ea2da Mon Sep 17 00:00:00 2001 From: iwehf Date: Tue, 4 Jun 2024 14:48:30 +0800 Subject: [PATCH 2/2] optimize faucet retrying message --- src/crynux_server/node_manager/node_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crynux_server/node_manager/node_manager.py b/src/crynux_server/node_manager/node_manager.py index 7567d887..0c8a8962 100644 --- a/src/crynux_server/node_manager/node_manager.py +++ b/src/crynux_server/node_manager/node_manager.py @@ -540,7 +540,7 @@ async def _request_tokens(self): with fail_after(5, shield=True): await self.state_cache.set_node_state( status=models.NodeStatus.Error, - message="Node manager init error: cannot request token from faucet. Retrying", + message="Node manager init error: cannot request token from faucet. Retrying...", ) raise