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

Merge remote-tracking branch 'detsys/detsys-main' into logger-improvements

Browse source
This commit is contained in:
Eelco Dolstra 2025-03-26 23:21:32 +01:00
commit c8692b378b
206 changed files with 4776 additions and 2018 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libutil/logging.cc
View file

@ -31,7 +31,7 @@ void setCurActivity(const ActivityId activityId)
curActivity = activityId;
}
Logger * logger = makeSimpleLogger(true);
std::unique_ptr<Logger> logger = makeSimpleLogger(true);
void Logger::warn(const std::string & msg)
{
@ -45,6 +45,19 @@ void Logger::writeToStdout(std::string_view s)
writeFull(standard_out, "\n");
}
Logger::Suspension Logger::suspend()
{
pause();
return Suspension { ._finalize = {[this](){this->resume();}} };
}
std::optional<Logger::Suspension> Logger::suspendIf(bool cond)
{
if (cond)
return suspend();
return {};
}
class SimpleLogger : public Logger
{
public:
@ -130,9 +143,9 @@ void writeToStderr(std::string_view s)
}
}
Logger * makeSimpleLogger(bool printBuildLogs)
std::unique_ptr<Logger> makeSimpleLogger(bool printBuildLogs)
{
return new SimpleLogger(printBuildLogs);
return std::make_unique<SimpleLogger>(printBuildLogs);
}
std::atomic<uint64_t> nextId{0};
@ -302,12 +315,12 @@ struct JSONLogger : Logger {
}
};
Logger * makeJSONLogger(Descriptor fd, bool includeNixPrefix)
std::unique_ptr<Logger> makeJSONLogger(Descriptor fd, bool includeNixPrefix)
{
return new JSONLogger(fd, includeNixPrefix);
return std::make_unique<JSONLogger>(fd, includeNixPrefix);
}
Logger * makeJSONLogger(const std::filesystem::path & path, bool includeNixPrefix)
std::unique_ptr<Logger> makeJSONLogger(const std::filesystem::path & path, bool includeNixPrefix)
{
struct JSONFileLogger : JSONLogger {
AutoCloseFD fd;
@ -325,7 +338,7 @@ Logger * makeJSONLogger(const std::filesystem::path & path, bool includeNixPrefi
if (!fd)
throw SysError("opening log file %1%", path);
return new JSONFileLogger(std::move(fd), includeNixPrefix);
return std::make_unique<JSONFileLogger>(std::move(fd), includeNixPrefix);
}
static Logger::Fields getFields(nlohmann::json & json)