Skip to content

Commit 67ca411

Browse files
committed
refactor: setup logger to accept ref to optional log writer config
With this, we avoid cloning the log writer config before calls to setup_logger. The default behaiour is also handled at a single location.
1 parent 0862be4 commit 67ca411

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/builder.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,7 @@ impl NodeBuilder {
428428
) -> Result<Node, BuildError> {
429429
use bitcoin::key::Secp256k1;
430430

431-
let log_writer_config = self.log_writer_config.clone().unwrap_or_default();
432-
let logger = setup_logger(&log_writer_config)?;
431+
let logger = setup_logger(&self.log_writer_config)?;
433432

434433
let seed_bytes = seed_bytes_from_config(
435434
&self.config,
@@ -494,8 +493,7 @@ impl NodeBuilder {
494493
pub fn build_with_vss_store_and_header_provider(
495494
&self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
496495
) -> Result<Node, BuildError> {
497-
let log_writer_config = self.log_writer_config.clone().unwrap_or_default();
498-
let logger = setup_logger(&log_writer_config)?;
496+
let logger = setup_logger(&self.log_writer_config)?;
499497

500498
let seed_bytes = seed_bytes_from_config(
501499
&self.config,
@@ -527,8 +525,7 @@ impl NodeBuilder {
527525

528526
/// Builds a [`Node`] instance according to the options previously configured.
529527
pub fn build_with_store(&self, kv_store: Arc<DynStore>) -> Result<Node, BuildError> {
530-
let log_writer_config = self.log_writer_config.clone().unwrap_or_default();
531-
let logger = setup_logger(&log_writer_config)?;
528+
let logger = setup_logger(&self.log_writer_config)?;
532529

533530
let seed_bytes = seed_bytes_from_config(
534531
&self.config,
@@ -1289,7 +1286,9 @@ fn build_with_store_internal(
12891286
}
12901287

12911288
/// Sets up the node logger.
1292-
fn setup_logger(config: &LogWriterConfig) -> Result<Arc<Logger>, BuildError> {
1289+
fn setup_logger(config_opt: &Option<LogWriterConfig>) -> Result<Arc<Logger>, BuildError> {
1290+
let config = if let Some(conf) = config_opt { conf } else { &LogWriterConfig::default() };
1291+
12931292
match config {
12941293
LogWriterConfig::File(fs_logger_config) => {
12951294
let log_file_path = if let Some(fp) = &fs_logger_config.log_file_path {

0 commit comments

Comments
 (0)