[Backport 2.33-maintenance] Don't throw Interrupted from JSONLogger::write#15338
Merged
internal-nix-ci[bot] merged 2 commits into2.33-maintenancefrom Feb 25, 2026
Merged
Conversation
Generalize writeToStderr into writeFullLogging, with similar behavior but taking an arbitrary fd, and reimplement writeToStderr with it as a convenient wrapper. (cherry picked from commit 473d54e)
Logging should not check for interrupts. Use the new writeFullLogging function to write JSON output to get similar behavior to SimpleLogger. This avoids the logger itself throwing Interrupted exceptions in handleExceptions. (cherry picked from commit 1210100)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Automatic backport to
2.33-maintenance, triggered by a label in #15335.