Merge #609: Add more bitcoind-related setup logging

5c87937 Add more bitcoind-related setup logging (Antoine Poinsot)

Pull request description:

  At startup it sometimes appear we may be hanging when setting up bitcoind. Add more logging to give more information about what's taking long to setup (for instance, loading the watchonly wallet).

  Related to #475.

ACKs for top commit:
  darosior:
    ACK 5c87937

Tree-SHA512: 75c553cabf545d57a5fc2d251e5b4cd880a931a408c6f1b1052067f2ccc8e0728ad779f30de5a88c2566f9e67ac085b713393ee4fa193331e49c3a8e6112ecc8

src/bitcoin/d/mod.rs

@@ -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(

src/lib.rs

@@ -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)
 }

tests/test_framework/lianad.py

@@ -119,7 +119,6 @@ def start(self):
         self.wait_for_logs(
             [
                 "Database initialized and checked",
-                "Connection to bitcoind established and checked.",
                 "JSONRPC server started.",
             ]
         )