logging: fix connected_to_journal logic
#119
Merged
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
|
/cc @lunaryorn for review I was re-reading this code for unrelated reasons, and I think I spotted a logic bug due to the use of |
swsnr
reviewed
Oct 20, 2022
lucab
force-pushed
the
ups/fix-journal-connect-check
branch
from
d4346c6
to
8e4cd2f
Compare
swsnr
previously approved these changes
Oct 20, 2022
src/logging.rs
Outdated
| || stream == JournalStream::from_fd(std::io::stdout()).ok() | ||
| JournalStream::from_env_default().map_or(false, |env_stream| { | ||
| JournalStream::from_fd(io::stderr()).map_or(false, |o| o == env_stream) | ||
| || JournalStream::from_fd(io::stdout()).map_or(false, |e| e == env_stream) |
There was a problem hiding this comment.
I was about to say that this is .exists only to realize that this doesn't exist in Rust 😅
LGTM
This tweaks the conditional checks in `connected_to_journal()` logic, in order to avoid buggy cases. In particular, in case of errors we may have ended up comparing `None` values possibly coming from the two sides (env and stdout/stderr stat), thus returning a false positive to consumers. Let's instead change the logic to be more explicit in case of real positive results, and use a single fallback for all negative cases.
lucab
force-pushed
the
ups/fix-journal-connect-check
branch
from
8e4cd2f
to
ec81ae6
Compare
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.
This tweaks the conditional checks in
connected_to_journal()logic, in order to avoid buggy cases.In particular, in case of errors we may have ended up comparing
Nonevalues possibly coming from the two sides (env and stdout/stderr stat), thus returning a false positive to consumers.Let's instead change the logic to be more explicit in case of real positive results, and use a single fallback for all negative cases.