wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 13:41:15 +02:00
Code Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2025-03-26 23:49:35 +01:00
parent c8692b378b
commit 17d0810a7c
4 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/daemon.cc
View file

@ -1050,17 +1050,7 @@ void processConnection(
if (!recursive) { if (!recursive) {
prevLogger_ = std::move(logger); prevLogger_ = std::move(logger);
logger = std::move(tunnelLogger_); logger = std::move(tunnelLogger_);
applyJSONLogger();
if (!loggerSettings.jsonLogPath.get().empty()) {
try {
std::vector<std::unique_ptr<Logger>> loggers;
loggers.push_back(std::move(logger));
loggers.push_back(makeJSONLogger(std::filesystem::path(loggerSettings.jsonLogPath.get()), false));
logger = makeTeeLogger(std::move(loggers));
} catch (...) {
ignoreExceptionExceptInterrupt();
}
}
} }
unsigned int opCount = 0; unsigned int opCount = 0;

14
src/libutil/logging.cc
View file

@ -341,6 +341,20 @@ std::unique_ptr<Logger> makeJSONLogger(const std::filesystem::path & path, bool
return std::make_unique<JSONFileLogger>(std::move(fd), includeNixPrefix); return std::make_unique<JSONFileLogger>(std::move(fd), includeNixPrefix);
} }
void applyJSONLogger()
{
if (!loggerSettings.jsonLogPath.get().empty()) {
try {
std::vector<std::unique_ptr<Logger>> loggers;
loggers.push_back(std::move(logger));
loggers.push_back(makeJSONLogger(std::filesystem::path(loggerSettings.jsonLogPath.get()), false));
logger = makeTeeLogger(std::move(loggers));
} catch (...) {
ignoreExceptionExceptInterrupt();
}
}
}
static Logger::Fields getFields(nlohmann::json & json) static Logger::Fields getFields(nlohmann::json & json)
{ {
Logger::Fields fields; Logger::Fields fields;

2
src/libutil/logging.hh
View file

@ -221,6 +221,8 @@ std::unique_ptr<Logger> makeJSONLogger(Descriptor fd, bool includeNixPrefix = tr
std::unique_ptr<Logger> makeJSONLogger(const std::filesystem::path & path, bool includeNixPrefix = true); std::unique_ptr<Logger> makeJSONLogger(const std::filesystem::path & path, bool includeNixPrefix = true);
void applyJSONLogger();
/** /**
* @param source A noun phrase describing the source of the message, e.g. "the builder". * @param source A noun phrase describing the source of the message, e.g. "the builder".
*/ */

11
src/nix/main.cc
View file

@ -487,16 +487,7 @@ void mainWrapped(int argc, char * * argv)
if (!args.helpRequested && !args.completions) throw; if (!args.helpRequested && !args.completions) throw;
} }
if (!loggerSettings.jsonLogPath.get().empty()) { applyJSONLogger();
try {
std::vector<std::unique_ptr<Logger>> loggers;
loggers.push_back(std::move(logger));
loggers.push_back(makeJSONLogger(std::filesystem::path(loggerSettings.jsonLogPath.get()), false));
logger = makeTeeLogger(std::move(loggers));
} catch (...) {
ignoreExceptionExceptInterrupt();
}
}
if (args.helpRequested) { if (args.helpRequested) {
std::vector<std::string> subcommand; std::vector<std::string> subcommand;