Copy logging macros over.

Author: tnull

src/event.rs

@@ -1,13 +1,14 @@
 use crate::{
-	ChannelManager, EventSender, FilesystemLogger, LdkLiteChainAccess, LdkLiteConfig, NetworkGraph,
+	ChannelManager, EventSender, LdkLiteChainAccess, LdkLiteConfig, NetworkGraph,
 	PaymentInfoStorage,
 };
 
+#[allow(unused_imports)]
+use crate::logger::{Logger, FilesystemLogger, log_info, log_error, log_warn, log_trace, log_given_level, log_internal};
+
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::keysinterface::KeysManager;
 use lightning::util::events as ldk_events;
-use lightning::util::logger::Logger;
-use lightning::{log_error, log_given_level, log_internal};
 
 use bdk::database::MemoryDatabase;
 

src/lib.rs

@@ -34,7 +34,9 @@ use access::LdkLiteChainAccess;
 pub use error::LdkLiteError as Error;
 pub use event::LdkLiteEvent;
 use event::LdkLiteEventHandler;
-use logger::FilesystemLogger;
+
+#[allow(unused_imports)]
+use logger::{Logger, FilesystemLogger, log_info, log_error, log_warn, log_trace, log_given_level, log_internal};
 
 use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient};
 use lightning::chain::{chainmonitor, Access, BestBlock, Confirm, Filter, Watch};
@@ -49,9 +51,7 @@ use lightning::routing::gossip::P2PGossipSync;
 use lightning::routing::scoring::ProbabilisticScorer;
 
 use lightning::util::config::UserConfig;
-use lightning::util::logger::Logger;
 use lightning::util::ser::ReadableArgs;
-use lightning::{log_error, log_given_level, log_internal};
 
 use lightning_background_processor::BackgroundProcessor;
 use lightning_background_processor::GossipSync as BPGossipSync;

src/logger.rs

@@ -1,4 +1,5 @@
-use lightning::util::logger::{Logger, Record};
+pub(crate) use lightning::util::logger::Logger;
+use lightning::util::logger::Record;
 use lightning::util::ser::Writer;
 
 use chrono::Utc;
@@ -8,6 +9,7 @@ use std::fs;
 pub(crate) struct FilesystemLogger {
 	data_dir: String,
 }
+
 impl FilesystemLogger {
 	pub(crate) fn new(data_dir: String) -> Self {
 		let logs_path = format!("{}/logs", data_dir);
@@ -36,3 +38,77 @@ impl Logger for FilesystemLogger {
 			.unwrap();
 	}
 }
+
+
+// TODO: We copied the logging macros for now from `lightning::util::macro_logger`. We should
+// switch back to using them from upstream after the next release, which includes their export.
+macro_rules! log_internal {
+	($logger: expr, $lvl:expr, $($arg:tt)+) => (
+		$logger.log(&lightning::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
+	);
+}
+pub(crate) use log_internal;
+
+macro_rules! log_given_level {
+	($logger: expr, $lvl:expr, $($arg:tt)+) => (
+		match $lvl {
+			#[cfg(not(any(feature = "max_level_off")))]
+			lightning::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
+			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
+			lightning::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
+			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
+			lightning::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
+			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
+			lightning::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
+			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
+			lightning::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
+			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
+			lightning::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
+
+			#[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
+			_ => {
+				// The level is disabled at compile-time
+			},
+		}
+	);
+}
+pub(crate) use log_given_level;
+
+#[allow(unused_macros)]
+macro_rules! log_error {
+	($logger: expr, $($arg:tt)*) => (
+		log_given_level!($logger, lightning::util::logger::Level::Error, $($arg)*)
+	)
+}
+pub(crate) use log_error;
+
+#[allow(unused_macros)]
+macro_rules! log_warn {
+	($logger: expr, $($arg:tt)*) => (
+		log_given_level!($logger, lightning::util::logger::Level::Warn, $($arg)*)
+	)
+}
+pub(crate) use log_warn;
+
+#[allow(unused_macros)]
+macro_rules! log_info {
+	($logger: expr, $($arg:tt)*) => (
+		log_given_level!($logger, lightning::util::logger::Level::Info, $($arg)*)
+	)
+}
+pub(crate) use log_info;
+
+#[allow(unused_macros)]
+macro_rules! log_debug {
+	($logger: expr, $($arg:tt)*) => (
+		log_given_level!($logger, lightning::util::logger::Level::Debug, $($arg)*)
+	)
+}
+
+#[allow(unused_macros)]
+macro_rules! log_trace {
+	($logger: expr, $($arg:tt)*) => (
+		log_given_level!($logger, lightning::util::logger::Level::Trace, $($arg)*)
+	)
+}
+pub(crate) use log_trace;