Skip to content

Commit 156d952

Browse files
committed
refactor: use new extension method to create child loggers in common
1 parent bce5be3 commit 156d952

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

mithril-common/src/cardano_block_scanner/chain_reader_block_streamer.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::cardano_block_scanner::BlockStreamer;
88
use crate::cardano_block_scanner::ChainScannedBlocks;
99
use crate::chain_reader::{ChainBlockNextAction, ChainBlockReader};
1010
use crate::entities::{BlockNumber, ChainPoint};
11+
use crate::logging::LoggerExtensions;
1112
use crate::StdResult;
1213

1314
/// The action that indicates what to do next with the streamer
@@ -111,7 +112,7 @@ impl ChainReaderBlockStreamer {
111112
from,
112113
until,
113114
max_roll_forwards_per_poll,
114-
logger: logger.new(slog::o!("src" => "ChainReaderBlockStreamer")),
115+
logger: logger.new_with_component_name::<Self>(),
115116
})
116117
}
117118

mithril-common/src/cardano_transactions_preloader.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use slog::{debug, info, Logger};
1111

1212
use crate::chain_observer::ChainObserver;
1313
use crate::entities::{BlockNumber, SignedEntityTypeDiscriminants};
14+
use crate::logging::LoggerExtensions;
1415
use crate::signable_builder::TransactionsImporter;
1516
use crate::signed_entity_type_lock::SignedEntityTypeLock;
1617
use crate::StdResult;
@@ -71,7 +72,7 @@ impl CardanoTransactionsPreloader {
7172
importer,
7273
security_parameter,
7374
chain_observer,
74-
logger: logger.new(slog::o!("src" => "CardanoTransactionsPreloader")),
75+
logger: logger.new_with_component_name::<Self>(),
7576
activation_state,
7677
}
7778
}

mithril-common/src/certificate_chain/certificate_verifier.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use crate::crypto_helper::{
1515
use crate::entities::{
1616
Certificate, CertificateSignature, ProtocolMessage, ProtocolMessagePartKey, ProtocolParameters,
1717
};
18+
use crate::logging::LoggerExtensions;
1819
use crate::StdResult;
1920

2021
#[cfg(test)]
@@ -122,7 +123,7 @@ impl MithrilCertificateVerifier {
122123
pub fn new(logger: Logger, certificate_retriever: Arc<dyn CertificateRetriever>) -> Self {
123124
debug!(logger, "New MithrilCertificateVerifier created");
124125
Self {
125-
logger: logger.new(slog::o!("src" => "MithrilCertificateVerifier")),
126+
logger: logger.new_with_component_name::<Self>(),
126127
certificate_retriever,
127128
}
128129
}

mithril-common/src/chain_reader/pallas_chain_reader.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use pallas_network::{
99
use pallas_traverse::MultiEraBlock;
1010
use slog::{debug, Logger};
1111

12+
use crate::logging::LoggerExtensions;
1213
use crate::{cardano_block_scanner::ScannedBlock, entities::ChainPoint, CardanoNetwork, StdResult};
1314

1415
use super::{ChainBlockNextAction, ChainBlockReader};
@@ -28,7 +29,7 @@ impl PallasChainReader {
2829
socket: socket.to_owned(),
2930
network,
3031
client: None,
31-
logger: logger.new(slog::o!("src" => "PallasChainReader")),
32+
logger: logger.new_with_component_name::<Self>(),
3233
}
3334
}
3435

mithril-common/src/digesters/cache/json_provider_builder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{
22
digesters::cache::{ImmutableFileDigestCacheProvider, JsonImmutableFileDigestCacheProvider},
3+
logging::LoggerExtensions,
34
StdResult,
45
};
56
use anyhow::Context;
@@ -43,7 +44,7 @@ impl<'a> JsonImmutableFileDigestCacheProviderBuilder<'a> {
4344

4445
/// Set the [Logger] to use.
4546
pub fn with_logger(&mut self, logger: Logger) -> &mut Self {
46-
self.logger = logger.new(slog::o!("src" => "JsonImmutableFileDigestCacheProviderBuilder"));
47+
self.logger = logger.new_with_component_name::<Self>();
4748
self
4849
}
4950

mithril-common/src/digesters/cardano_immutable_digester.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use crate::{
44
ImmutableFile,
55
},
66
entities::{CardanoDbBeacon, HexEncodedDigest, ImmutableFileName},
7+
logging::LoggerExtensions,
78
};
89
use async_trait::async_trait;
910
use sha2::{Digest, Sha256};
@@ -32,7 +33,7 @@ impl CardanoImmutableDigester {
3233
) -> Self {
3334
Self {
3435
cache_provider,
35-
logger: logger.new(slog::o!("src" => "CardanoImmutableDigester")),
36+
logger: logger.new_with_component_name::<Self>(),
3637
}
3738
}
3839
}

mithril-common/src/signable_builder/cardano_immutable_full_signable_builder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::{
66
use crate::{
77
digesters::ImmutableDigester,
88
entities::{CardanoDbBeacon, ProtocolMessage, ProtocolMessagePartKey},
9+
logging::LoggerExtensions,
910
signable_builder::SignableBuilder,
1011
StdResult,
1112
};
@@ -29,7 +30,7 @@ impl CardanoImmutableFilesFullSignableBuilder {
2930
) -> Self {
3031
Self {
3132
immutable_digester,
32-
logger: logger.new(slog::o!("src" => "CardanoImmutableFilesFullSignableBuilder")),
33+
logger: logger.new_with_component_name::<Self>(),
3334
dirpath: dirpath.to_owned(),
3435
}
3536
}

mithril-common/src/signable_builder/cardano_transactions.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use slog::{debug, Logger};
77
use crate::{
88
crypto_helper::{MKMap, MKMapNode, MKTreeNode, MKTreeStorer},
99
entities::{BlockNumber, BlockRange, ProtocolMessage, ProtocolMessagePartKey},
10+
logging::LoggerExtensions,
1011
signable_builder::SignableBuilder,
1112
StdResult,
1213
};
@@ -65,7 +66,7 @@ impl<S: MKTreeStorer> CardanoTransactionsSignableBuilder<S> {
6566
Self {
6667
transaction_importer,
6768
block_range_root_retriever,
68-
logger: logger.new(slog::o!("src" => "CardanoTransactionsSignableBuilder")),
69+
logger: logger.new_with_component_name::<Self>(),
6970
}
7071
}
7172
}

0 commit comments

Comments
 (0)