Skip to content

Fix panics in file rotation #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DobbiKov merged 1 commit into from
Jun 4, 2025
Merged

Fix panics in file rotation #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/logger/file_handler/file_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ pub(crate) enum VerifyConstraintsRes {
pub(crate) enum WriteLogError {
#[error("unable to write to the file: {0}")]
UnableToWriteToFile(WriteToFileError),
#[error("constraints verification failed: {0}")]
VerifyConstraintsError(VerifyConstraintsError),
}
#[derive(Debug, Error)]
pub(crate) enum CreateNewFileError {
Expand Down Expand Up @@ -376,25 +378,23 @@ impl FileManager {
mess: &str,
config: Config,
) -> Result<VerifyConstraintsRes, WriteLogError> {
let mut ok_res = Ok(VerifyConstraintsRes::ConstraintsPassed);
match self.verify_constraints(&config) {
Ok(r) => ok_res = Ok(r),
let verify_res = match self.verify_constraints(&config) {
Ok(r) => Ok(r),
Err(e) => {
eprintln!("An error occured while verifying constraints: {}", e);
eprintln!("Trying to write to an old file");
ok_res = Err(e)
Err(e)
}
}
};

let arc_file = self.curr_file.clone();
let mut file = (*arc_file).try_clone().map_err(|e| WriteLogError::UnableToWriteToFile(WriteToFileError::UnexpectedError(e)))?;

let res = helper::write_to_file(&mut file, mess)
.map(|_| ok_res.unwrap())
.map_err(WriteLogError::UnableToWriteToFile);
helper::write_to_file(&mut file, mess)
.map_err(WriteLogError::UnableToWriteToFile)?;

self.set_curr_file(file);
res

verify_res.map_err(WriteLogError::VerifyConstraintsError)
}
}

Expand Down