From c68ce6e1472be821343ba7057857bec5626dc791 Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Wed, 29 Nov 2023 20:19:44 +0100
Subject: [PATCH] state-db: log_target usage fixed (#2547)
Use `LOG_TARGET/LOG_TARGET_PIN` in logs.
---
substrate/client/state-db/src/lib.rs | 6 +++---
substrate/client/state-db/src/pruning.rs | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/substrate/client/state-db/src/lib.rs b/substrate/client/state-db/src/lib.rs
index c656f126ae6..41c231c31aa 100644
--- a/substrate/client/state-db/src/lib.rs
+++ b/substrate/client/state-db/src/lib.rs
@@ -474,7 +474,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> StateDbSync<BlockHash, Key, D> {
if have_block {
let refs = self.pinned.entry(hash.clone()).or_default();
if *refs == 0 {
- trace!(target: "state-db-pin", "Pinned block: {:?}", hash);
+ trace!(target: LOG_TARGET_PIN, "Pinned block: {:?}", hash);
self.non_canonical.pin(hash);
}
*refs += 1;
@@ -491,11 +491,11 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> StateDbSync<BlockHash, Key, D> {
Entry::Occupied(mut entry) => {
*entry.get_mut() -= 1;
if *entry.get() == 0 {
- trace!(target: "state-db-pin", "Unpinned block: {:?}", hash);
+ trace!(target: LOG_TARGET_PIN, "Unpinned block: {:?}", hash);
entry.remove();
self.non_canonical.unpin(hash);
} else {
- trace!(target: "state-db-pin", "Releasing reference for {:?}", hash);
+ trace!(target: LOG_TARGET_PIN, "Releasing reference for {:?}", hash);
}
},
Entry::Vacant(_) => {},
diff --git a/substrate/client/state-db/src/pruning.rs b/substrate/client/state-db/src/pruning.rs
index 623d30b098b..ae8a9a12490 100644
--- a/substrate/client/state-db/src/pruning.rs
+++ b/substrate/client/state-db/src/pruning.rs
@@ -385,7 +385,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
/// Prune next block. Expects at least one block in the window. Adds changes to `commit`.
pub fn prune_one(&mut self, commit: &mut CommitSet<Key>) -> Result<(), Error<D::Error>> {
if let Some(pruned) = self.queue.pop_front(self.base)? {
- trace!(target: "state-db", "Pruning {:?} ({} deleted)", pruned.hash, pruned.deleted.len());
+ trace!(target: LOG_TARGET, "Pruning {:?} ({} deleted)", pruned.hash, pruned.deleted.len());
let index = self.base;
commit.data.deleted.extend(pruned.deleted.into_iter());
commit.meta.inserted.push((to_meta_key(LAST_PRUNED, &()), index.encode()));
@@ -393,7 +393,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
self.base += 1;
Ok(())
} else {
- trace!(target: "state-db", "Trying to prune when there's nothing to prune");
+ trace!(target: LOG_TARGET, "Trying to prune when there's nothing to prune");
Err(Error::StateDb(StateDbError::BlockUnavailable))
}
}
@@ -418,7 +418,7 @@ impl<BlockHash: Hash, Key: Hash, D: MetaDb> RefWindow<BlockHash, Key, D> {
return Err(Error::StateDb(StateDbError::InvalidBlockNumber))
}
trace!(
- target: "state-db",
+ target: LOG_TARGET,
"Adding to pruning window: {:?} ({} inserted, {} deleted)",
hash,
commit.data.inserted.len(),
--
GitLab