wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Merge pull request #13249 from NixOS/more-robust-json-logger

Browse source 
Make the JSON logger more robust
This commit is contained in:
Jörg Thalheim 2025-05-23 10:25:16 +02:00 • committed by GitHub
commit 5b4806ab3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libutil/logging.cc
View file

@ -204,6 +204,7 @@ struct JSONLogger : Logger {
struct State struct State
{ {
bool enabled = true;
}; };
Sync<State> _state; Sync<State> _state;
@ -216,8 +217,18 @@ struct JSONLogger : Logger {
/* Acquire a lock to prevent log messages from clobbering each /* Acquire a lock to prevent log messages from clobbering each
other. */ other. */
auto state(_state.lock()); try {
writeLine(fd, line); auto state(_state.lock());
if (state->enabled)
writeLine(fd, line);
} catch (...) {
bool enabled = false;
std::swap(_state.lock()->enabled, enabled);
if (enabled) {
ignoreExceptionExceptInterrupt();
logger->warn("disabling JSON logger due to write errors");
}
}
} }
void log(Verbosity lvl, std::string_view s) override void log(Verbosity lvl, std::string_view s) override