Skip to content

Commit

Permalink
Add more bitcoind-related setup logging
Browse files Browse the repository at this point in the history
At startup it sometimes appear we may be hanging when setting up
bitcoind. Add more loading to give more information about what's taking
long to setup (for instance, loading the watchonly wallet).
  • Loading branch information
darosior committed Aug 14, 2023
1 parent 6c969ae commit 8e4b5e9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/bitcoin/d/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ impl BitcoinD {
watchonly_wallet_path: watchonly_wallet_path.clone(),
retries: 0,
};
log::info!("Checking the connection to bitcoind.");
dummy_bitcoind.check_connection()?;
log::info!("Connection to bitcoind checked.");

// Now the connection is checked, create the clients with an appropriate timeout.
let node_client = Client::with_transport(
Expand Down
6 changes: 4 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,14 @@ fn setup_bitcoind(
wo_name,
)?;

log::info!("Creating a new watchonly wallet on bitcoind.");
bitcoind.create_watchonly_wallet(&config.main_descriptor)?;
log::info!("Created a new watchonly wallet on bitcoind.");
log::info!("Watchonly wallet created.");
}
log::info!("Loading our watchonly wallet on bitcoind.");
bitcoind.maybe_load_watchonly_wallet()?;
bitcoind.wallet_sanity_checks(&config.main_descriptor)?;
log::info!("Connection to bitcoind established and checked.");
log::info!("Watchonly wallet loaded on bitcoind and sanity checked.");

Ok(bitcoind)
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_framework/lianad.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def start(self):
self.wait_for_logs(
[
"Database initialized and checked",
"Connection to bitcoind established and checked.",
"Watchonly wallet loaded on bitcoind and sanity checked.",
"JSONRPC server started.",
]
)
Expand Down

0 comments on commit 8e4b5e9

Please sign in to comment.