From b90e3603bea09ab84e16bea41548e896bbbf6bdb Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:30:32 +0200
Subject: [PATCH] log_enabled used properly
---
substrate/client/transaction-pool/src/common/log_xt.rs | 6 +++---
.../client/transaction-pool/src/fork_aware_txpool/view.rs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/substrate/client/transaction-pool/src/common/log_xt.rs b/substrate/client/transaction-pool/src/common/log_xt.rs
index 6dc0428a63c..6c3752c1d50 100644
--- a/substrate/client/transaction-pool/src/common/log_xt.rs
+++ b/substrate/client/transaction-pool/src/common/log_xt.rs
@@ -21,21 +21,21 @@
/// Logs every transaction from given `tx_collection` with given level.
macro_rules! log_xt {
(data: hash, target: $target:expr, $level:expr, $tx_collection:expr, $text_with_format:expr) => {
- if log::log_enabled!($level) {
+ if log::log_enabled!(target: $target, $level) {
for tx in $tx_collection {
log::log!(target: $target, $level, $text_with_format, tx);
}
}
};
(data: hash, target: $target:expr, $level:expr, $tx_collection:expr, $text_with_format:expr, $($arg:expr),*) => {
- if log::log_enabled!($level) {
+ if log::log_enabled!(target: $target, $level) {
for tx in $tx_collection {
log::log!(target: $target, $level, $text_with_format, tx, $($arg),*);
}
}
};
(data: tuple, target: $target:expr, $level:expr, $tx_collection:expr, $text_with_format:expr) => {
- if log::log_enabled!($level) {
+ if log::log_enabled!(target: $target, $level) {
for tx in $tx_collection {
log::log!(target: $target, $level, $text_with_format, tx.0, tx.1)
}
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
index 2d39530a0b9..a5374d0f84e 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
@@ -159,7 +159,7 @@ where
source: TransactionSource,
xts: impl IntoIterator<Item = ExtrinsicFor<ChainApi>>,
) -> Vec<Result<ExtrinsicHash<ChainApi>, ChainApi::Error>> {
- if log::log_enabled!(log::Level::Trace) {
+ if log::log_enabled!(target: LOG_TARGET, log::Level::Trace) {
let xts = xts.into_iter().collect::<Vec<_>>();
log_xt_trace!(target: LOG_TARGET, xts.iter().map(|xt| self.pool.validated_pool().api().hash_and_length(xt).0), "[{:?}] view::submit_many at:{}", self.at.hash);
self.pool.submit_at(&self.at, source, xts).await
--
GitLab