wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 19:57:59 +02:00
Code Activity

Make the JSON logger more robust

Browse source 
We now ignore connection / write errors.
This commit is contained in:
Eelco Dolstra 2025-03-14 17:33:48 +01:00
parent fd0d824fa5
commit 8674792eba
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libutil/logging.cc
View file

@ -196,6 +196,7 @@ struct JSONLogger : Logger {
struct State
{
bool enabled = true;
};
Sync<State> _state;
@ -208,8 +209,18 @@ struct JSONLogger : Logger {
/* Acquire a lock to prevent log messages from clobbering each
other. */
auto state(_state.lock());
writeLine(fd, line);
try {
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