From: Valentine Wallace <vwallace@protonmail.com>
Date: Wed, 2 Dec 2020 22:18:17 +0000 (-0500)
Subject: Make logger macros public
X-Git-Tag: v0.0.13~25^2~4
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f41cfb4da95727a22bbc6a023100e6e23767dd3f;p=rust-lightning

Make logger macros public

These will be used in upcoming commits for the BackgroundProcessor
to log.
---

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 2065f4045..ab2b6ceea 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -155,12 +155,17 @@ macro_rules! log_spendable {
 	}
 }
 
+/// Create a new Record and log it. You probably don't want to use this macro directly,
+/// but it needs to be exported so `log_trace` etc can use it in external crates.
+#[macro_export]
 macro_rules! log_internal {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
-		$logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+		$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
 	);
 }
 
+/// Log an error.
+#[macro_export]
 macro_rules! log_error {
 	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off")))]
@@ -189,6 +194,8 @@ macro_rules! log_debug {
 	)
 }
 
+/// Log a trace log.
+#[macro_export]
 macro_rules! log_trace {
 	($logger: expr, $($arg:tt)*) => (
 		#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
diff --git a/lightning/src/util/mod.rs b/lightning/src/util/mod.rs
index 57b5f2d74..b8028ea97 100644
--- a/lightning/src/util/mod.rs
+++ b/lightning/src/util/mod.rs
@@ -25,8 +25,10 @@ pub(crate) mod transaction_utils;
 
 #[macro_use]
 pub(crate) mod ser_macros;
+
+/// Logging macro utilities.
 #[macro_use]
-pub(crate) mod macro_logger;
+pub mod macro_logger;
 
 // These have to come after macro_logger to build
 pub mod logger;