Fix rolling file appender bug #6266
Open
+30
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eserilev
added
bug
ackintosh
reviewed
Aug 17, 2024
common/logging/src/lib.rs
Outdated
Comment on lines
227
to
241
| for p in base_tracing_log_path.iter() { | ||
| match metadata(p) { | ||
| Ok(metadata) => { | ||
| if metadata.is_dir() { | ||
| tracing_log_path = tracing_log_path.join(p); | ||
| } | ||
| } | ||
| // An error here just means that part of `base_tracing_log_path` doesn't exist, | ||
| // we can safely continue. | ||
| Err(_) => { | ||
| tracing_log_path = base_tracing_log_path; | ||
| break; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I noticed that the for loop unexpectedly breaks in the Err(_) statement when running Lighthouse with the --logfile /Users/akihito/logs/beacon.log parameter. This happens because the strings passed to match metadata(p) are [/, Users, akihito, logs, beacon.log], and the second string, Users (not /Users), doesn't exist in my working directory.
I think we can fix this by making the following change:
for p in base_tracing_log_path.iter() {
+ tracing_log_path = tracing_log_path.join(p);
+ match tracing_log_path.metadata() {
Ok(metadata) => {
+ if !metadata.is_dir() {
+ tracing_log_path.pop();
+ break;
}
}There was a problem hiding this comment.
thanks for catching that issue! i've pushed up a fix here: f97e0d4
havent had a chance to test it yet, will get to that soon
michaelsproul
added
waiting-on-author
michaelsproul
added
ready-for-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Addressed
Closes #6246
Proposed Changes
Ensures that the file path passed to the rolling file appender only contains directories. This PR iterates through each piece of
--logfileand if its a dir, appends it to the file path we use for the rolling file appender. If all or parts of--logfiledont exist yet, we just use the full--logfilepath.