Skip to content

Commit 65604ce

Browse files
committed
refactor: clean up match arm in setup_logger
Additionally, clone Arc to custom_log_writer idiomatically.
1 parent 67ca411 commit 65604ce

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

src/builder.rs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ fn build_with_store_internal(
12891289
fn setup_logger(config_opt: &Option<LogWriterConfig>) -> Result<Arc<Logger>, BuildError> {
12901290
let config = if let Some(conf) = config_opt { conf } else { &LogWriterConfig::default() };
12911291

1292-
match config {
1292+
let logger = match config {
12931293
LogWriterConfig::File(fs_logger_config) => {
12941294
let log_file_path = if let Some(fp) = &fs_logger_config.log_file_path {
12951295
fp
@@ -1298,19 +1298,20 @@ fn setup_logger(config_opt: &Option<LogWriterConfig>) -> Result<Arc<Logger>, Bui
12981298
};
12991299
let log_level = fs_logger_config.log_level.unwrap_or(DEFAULT_LOG_LEVEL);
13001300

1301-
Ok(Arc::new(
1302-
Logger::new_fs_writer(log_file_path, log_level)
1303-
.map_err(|_| BuildError::LoggerSetupFailed)?,
1304-
))
1301+
Logger::new_fs_writer(log_file_path, log_level)
1302+
.map_err(|_| BuildError::LoggerSetupFailed)?
13051303
},
1306-
LogWriterConfig::Log(log_level) => Ok(Arc::new(
1307-
Logger::new_log_facade(*log_level).map_err(|_| BuildError::LoggerSetupFailed)?,
1308-
)),
1309-
LogWriterConfig::Custom(custom_log_writer) => Ok(Arc::new(
1310-
Logger::new_custom_writer(custom_log_writer.clone())
1311-
.map_err(|_| BuildError::LoggerSetupFailed)?,
1312-
)),
1313-
}
1304+
LogWriterConfig::Log(log_level) => {
1305+
Logger::new_log_facade(*log_level).map_err(|_| BuildError::LoggerSetupFailed)?
1306+
},
1307+
1308+
LogWriterConfig::Custom(custom_log_writer) => {
1309+
Logger::new_custom_writer(Arc::clone(custom_log_writer))
1310+
.map_err(|_| BuildError::LoggerSetupFailed)?
1311+
},
1312+
};
1313+
1314+
Ok(Arc::new(logger))
13141315
}
13151316

13161317
fn seed_bytes_from_config(

0 commit comments

Comments
 (0)