Skip to content

Commit 90b4d4b

Browse files
committed
refactor: clean up match arm in setup_logger
Additionally, clone Arc to custom_log_writer idiomatically.
1 parent 2bcfa89 commit 90b4d4b

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
@@ -1283,7 +1283,7 @@ fn build_with_store_internal(
12831283
fn setup_logger(config_opt: &Option<LogWriterConfig>) -> Result<Arc<Logger>, BuildError> {
12841284
let config = if let Some(conf) = config_opt { conf } else { &LogWriterConfig::default() };
12851285

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

1295-
Ok(Arc::new(
1296-
Logger::new_fs_writer(log_file_path, log_level)
1297-
.map_err(|_| BuildError::LoggerSetupFailed)?,
1298-
))
1295+
Logger::new_fs_writer(log_file_path, log_level)
1296+
.map_err(|_| BuildError::LoggerSetupFailed)?
12991297
},
1300-
LogWriterConfig::Log(log_level) => Ok(Arc::new(
1301-
Logger::new_log_facade(*log_level).map_err(|_| BuildError::LoggerSetupFailed)?,
1302-
)),
1303-
LogWriterConfig::Custom(custom_log_writer) => Ok(Arc::new(
1304-
Logger::new_custom_writer(custom_log_writer.clone())
1305-
.map_err(|_| BuildError::LoggerSetupFailed)?,
1306-
)),
1307-
}
1298+
LogWriterConfig::Log(log_level) => {
1299+
Logger::new_log_facade(*log_level).map_err(|_| BuildError::LoggerSetupFailed)?
1300+
},
1301+
1302+
LogWriterConfig::Custom(custom_log_writer) => {
1303+
Logger::new_custom_writer(Arc::clone(custom_log_writer))
1304+
.map_err(|_| BuildError::LoggerSetupFailed)?
1305+
},
1306+
};
1307+
1308+
Ok(Arc::new(logger))
13081309
}
13091310

13101311
fn seed_bytes_from_config(

0 commit comments

Comments
 (0)