add console logging

Author: joostjager

tests/integration_tests_rust.rs

@@ -7,6 +7,7 @@
 
 mod common;
 
+use chrono::Utc;
 use common::{
 	bump_fee_and_broadcast, distribute_funds_unconfirmed, do_channel_full_cycle,
 	expect_channel_pending_event, expect_channel_ready_event, expect_event,
@@ -18,12 +19,12 @@ use common::{
 	setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
-use ldk_node::config::EsploraSyncConfig;
-use ldk_node::liquidity::LSPS2ServiceConfig;
 use ldk_node::payment::{
 	ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
 	QrPaymentResult,
 };
+use ldk_node::{config::EsploraSyncConfig, logger::LogWriter};
+use ldk_node::{liquidity::LSPS2ServiceConfig, logger::LogRecord};
 use ldk_node::{Builder, Event, NodeError};
 
 use lightning::ln::channelmanager::PaymentId;
@@ -1130,22 +1131,58 @@ fn simple_bolt12_send_receive() {
 	assert_eq!(node_a_payments.first().unwrap().amount_msat, Some(overpaid_amount));
 }
 
+struct MultiNodeLogger {
+	node_id: String,
+}
+
+impl MultiNodeLogger {
+	fn new(node_id: String) -> Self {
+		Self { node_id }
+	}
+}
+
+impl LogWriter for MultiNodeLogger {
+	fn log<'a>(&self, record: LogRecord<'a>) {
+		let log = format!(
+			"[{}] {} {:<5} [{}:{}] {}\n",
+			self.node_id,
+			Utc::now().format("%Y-%m-%d %H:%M:%S%.3f"),
+			record.level.to_string(),
+			record.module_path,
+			record.line,
+			record.args
+		);
+
+		print!("{}", log);
+	}
+}
+
 #[test]
 fn static_invoice_server() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
 	let chain_source = TestChainSource::Esplora(&electrsd);
 
-	let config_sender = random_config(true);
+	let mut config_sender = random_config(true);
+	config_sender.log_writer =
+		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("sender      ".to_string())));
 	let node_sender = setup_node(&chain_source, config_sender, None);
 
-	let config_sender_lsp = random_config(true);
+	let mut config_sender_lsp = random_config(true);
+	config_sender_lsp.log_writer =
+		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("sender_lsp  ".to_string())));
 	let node_sender_lsp = setup_node(&chain_source, config_sender_lsp, None);
 
 	let mut config_receiver_lsp = random_config(true);
 	config_receiver_lsp.node_config.async_payment_services_enabled = true;
+	config_receiver_lsp.log_writer =
+		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("receiver_lsp".to_string())));
+
 	let node_receiver_lsp = setup_node(&chain_source, config_receiver_lsp, None);
 
-	let config_receiver = random_config(true);
+	let mut config_receiver = random_config(true);
+	config_receiver.log_writer =
+		TestLogWriter::Custom(Arc::new(MultiNodeLogger::new("receiver    ".to_string())));
+
 	let node_receiver = setup_node(&chain_source, config_receiver, None);
 
 	let address_sender = node_sender.onchain_payment().new_address().unwrap();