github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-02-19 03:04:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(tracing): return error instead of panicking on log directory creation failure (#22100)

Browse Source 
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Georgios Konstantopoulos
2026-02-11 19:40:39 -05:00
committed by GitHub
parent 8bedaaee71
commit 8a6bbd29fe
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/tracing/src/layers.rs
View File

@@ -125,7 +125,7 @@ impl Layers {
filter: &str,
file_info: FileInfo,
) -> eyre::Result<FileWorkerGuard> {
let (writer, guard) = file_info.create_log_writer();
let (writer, guard) = file_info.create_log_writer()?;
let file_filter = build_env_filter(None, filter)?;
let layer = format.apply(file_filter, None, Some(writer));
self.add_layer(layer);
@@ -221,32 +221,29 @@ impl FileInfo {
}
/// Creates the log directory if it doesn't exist.
///
/// # Returns
/// A reference to the path of the log directory.
fn create_log_dir(&self) -> &Path {
fn create_log_dir(&self) -> eyre::Result<&Path> {
let log_dir: &Path = self.dir.as_ref();
if !log_dir.exists() {
std::fs::create_dir_all(log_dir).expect("Could not create log directory");
std::fs::create_dir_all(log_dir)
.map_err(|err| eyre::eyre!("Could not create log directory {log_dir:?}: {err}"))?;
}
log_dir
Ok(log_dir)
}
/// Creates a non-blocking writer for the log file.
///
/// # Returns
/// A tuple containing the non-blocking writer and its associated worker guard.
fn create_log_writer(&self) -> (tracing_appender::non_blocking::NonBlocking, WorkerGuard) {
let log_dir = self.create_log_dir();
fn create_log_writer(
&self,
) -> eyre::Result<(tracing_appender::non_blocking::NonBlocking, WorkerGuard)> {
let log_dir = self.create_log_dir()?;
let (writer, guard) = tracing_appender::non_blocking(
RollingFileAppender::new(
log_dir.join(&self.file_name),
RollingConditionBasic::new().max_size(self.max_size_bytes),
self.max_files,
)
.expect("Could not initialize file logging"),
.map_err(|err| eyre::eyre!("Could not initialize file logging: {err}"))?,
);
(writer, guard)
Ok((writer, guard))
}
}