We upgrade to 25.05 release, which contains the curl commit https://github.com/curl/curl/commit/5fbd78eb2dc4afbd8884e8eed27147fc3d4318f6 done in https://github.com/NixOS/nixpkgs/pull/396200#issuecomment-2795944006. This fixes HTTP transfers generating arbitrary errors and possibly failing unusually. Users who are already depending on 25.05-small or a recent unstable already had the fix. Special mention to the Linux kernel who gave me the opportunity to get on a 24 hours bisection side quest to fix the local release engineering test. Special thanks to everyone who had to endure me ranting. Change-Id: I866caf65d5ea103f1fa5eccd57df8031c9eacda0 Co-authored-by: eldritch horrors <pennae@lix.systems> Co-authored-by: helle <helle@h3l.li> Signed-off-by: Raito Bezarius <raito@lix.systems>
338 lines
8.3 KiB
C++
338 lines
8.3 KiB
C++
#pragma once
|
|
///@file
|
|
|
|
#include "lix/libutil/types.hh"
|
|
#include "lix/libutil/error.hh"
|
|
#include "lix/libutil/config.hh"
|
|
|
|
namespace nix {
|
|
|
|
typedef enum {
|
|
actUnknown = 0,
|
|
actCopyPath = 100,
|
|
actFileTransfer = 101,
|
|
actRealise = 102,
|
|
actCopyPaths = 103,
|
|
actBuilds = 104,
|
|
|
|
/** Fields:
|
|
* 0: string: path to store derivation being built.
|
|
* 1: string: representing the machine this is being built on. Empty string if local machine.
|
|
* 2: int: curRound, not used anymore, always 1?
|
|
* 3: int: nrRounds, not used anymore always 1?
|
|
*/
|
|
actBuild = 105,
|
|
actOptimiseStore = 106,
|
|
actVerifyPaths = 107,
|
|
|
|
/** Fields:
|
|
* 0: string: store path
|
|
* 1: string: substituter
|
|
*/
|
|
actSubstitute = 108,
|
|
|
|
/** Fields:
|
|
* 0: string: store path
|
|
* 1: string: substituter
|
|
*/
|
|
actQueryPathInfo = 109,
|
|
|
|
/** Fields:
|
|
* 0: string: store path
|
|
*/
|
|
actPostBuildHook = 110,
|
|
actBuildWaiting = 111,
|
|
} ActivityType;
|
|
|
|
template<>
|
|
struct json::is_integral_enum<ActivityType> : std::true_type {};
|
|
|
|
typedef enum {
|
|
/** Fields:
|
|
* 0: int: bytes linked
|
|
*/
|
|
resFileLinked = 100,
|
|
|
|
/** Fields:
|
|
* 0: string: last line
|
|
*/
|
|
resBuildLogLine = 101,
|
|
resUntrustedPath = 102,
|
|
resCorruptedPath = 103,
|
|
|
|
/** Fields:
|
|
* 0: string: phase name
|
|
*/
|
|
resSetPhase = 104,
|
|
|
|
/** Fields:
|
|
* 0: int: done
|
|
* 1: int: expected
|
|
* 2: int: running
|
|
* 3: int: failed
|
|
*/
|
|
resProgress = 105,
|
|
|
|
/** Fields:
|
|
* 0: int: ActivityType
|
|
* 1: int: expected
|
|
*/
|
|
resSetExpected = 106,
|
|
|
|
/** Fields:
|
|
* 0: string: last line
|
|
*/
|
|
resPostBuildLogLine = 107,
|
|
} ResultType;
|
|
|
|
template<>
|
|
struct json::is_integral_enum<ResultType> : std::true_type {};
|
|
|
|
typedef uint64_t ActivityId;
|
|
|
|
struct LoggerSettings : Config
|
|
{
|
|
#include "logging-settings.gen.inc"
|
|
};
|
|
|
|
extern LoggerSettings loggerSettings;
|
|
|
|
class Logger
|
|
{
|
|
friend struct Activity;
|
|
|
|
public:
|
|
|
|
struct Field
|
|
{
|
|
// FIXME: use std::variant.
|
|
enum { tInt = 0, tString = 1 } type;
|
|
uint64_t i = 0;
|
|
std::string s;
|
|
Field(const std::string & s) : type(tString), s(s) { }
|
|
Field(const char * s) : type(tString), s(s) { }
|
|
Field(const uint64_t & i) : type(tInt), i(i) { }
|
|
};
|
|
|
|
typedef std::vector<Field> Fields;
|
|
|
|
virtual ~Logger() { }
|
|
|
|
virtual void pause() { };
|
|
virtual void resetProgress() { };
|
|
virtual void resume() { };
|
|
|
|
// Whether the logger prints the whole build log
|
|
virtual bool isVerbose() { return false; }
|
|
|
|
virtual void log(Verbosity lvl, std::string_view s) = 0;
|
|
|
|
void log(std::string_view s)
|
|
{
|
|
log(lvlInfo, s);
|
|
}
|
|
|
|
virtual void logEI(const ErrorInfo & ei) = 0;
|
|
|
|
void logEI(Verbosity lvl, ErrorInfo ei)
|
|
{
|
|
ei.level = lvl;
|
|
logEI(ei);
|
|
}
|
|
|
|
virtual void warn(const std::string & msg);
|
|
|
|
virtual void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
|
|
const std::string & s, const Fields & fields, ActivityId parent) { };
|
|
|
|
virtual void stopActivity(ActivityId act) { };
|
|
|
|
virtual void result(ActivityId act, ResultType type, const Fields & fields) { };
|
|
|
|
virtual void writeToStdout(std::string_view s);
|
|
|
|
template<typename... Args>
|
|
inline void cout(const Args & ... args)
|
|
{
|
|
writeToStdout(fmt(args...));
|
|
}
|
|
|
|
virtual std::optional<char> ask(std::string_view s)
|
|
{ return {}; }
|
|
|
|
virtual void setPrintBuildLogs(bool printBuildLogs)
|
|
{ }
|
|
|
|
virtual void setPrintMultiline(bool printMultiline)
|
|
{ }
|
|
};
|
|
|
|
/**
|
|
* A variadic template that does nothing.
|
|
*
|
|
* Useful to call a function with each argument in a parameter pack.
|
|
*/
|
|
struct nop
|
|
{
|
|
template<typename... T> nop(T...)
|
|
{ }
|
|
};
|
|
|
|
ActivityId getCurActivity();
|
|
void setCurActivity(const ActivityId activityId);
|
|
|
|
struct Activity
|
|
{
|
|
Logger & logger;
|
|
|
|
const ActivityId id;
|
|
|
|
Activity(Logger & logger, Verbosity lvl, ActivityType type, const std::string & s = "",
|
|
const Logger::Fields & fields = {}, ActivityId parent = getCurActivity());
|
|
|
|
Activity(Logger & logger, ActivityType type,
|
|
const Logger::Fields & fields = {}, ActivityId parent = getCurActivity())
|
|
: Activity(logger, lvlError, type, "", fields, parent) { };
|
|
|
|
Activity(const Activity & act) = delete;
|
|
|
|
~Activity();
|
|
|
|
void progress(uint64_t done = 0, uint64_t expected = 0, uint64_t running = 0, uint64_t failed = 0) const
|
|
{ result(resProgress, done, expected, running, failed); }
|
|
|
|
void setExpected(ActivityType type2, uint64_t expected) const
|
|
{ result(resSetExpected, type2, expected); }
|
|
|
|
template<typename... Args>
|
|
void result(ResultType type, const Args & ... args) const
|
|
{
|
|
Logger::Fields fields;
|
|
nop{(fields.emplace_back(Logger::Field(args)), 1)...};
|
|
result(type, fields);
|
|
}
|
|
|
|
void result(ResultType type, const Logger::Fields & fields) const
|
|
{
|
|
logger.result(id, type, fields);
|
|
}
|
|
|
|
friend class Logger;
|
|
};
|
|
|
|
class PushActivity
|
|
{
|
|
std::optional<ActivityId> prevAct;
|
|
|
|
public:
|
|
PushActivity(ActivityId act) : prevAct(getCurActivity())
|
|
{
|
|
setCurActivity(act);
|
|
}
|
|
|
|
PushActivity(PushActivity && other)
|
|
{
|
|
std::swap(prevAct, other.prevAct);
|
|
}
|
|
|
|
PushActivity & operator=(PushActivity && other)
|
|
{
|
|
auto tmp(std::move(other));
|
|
std::swap(prevAct, tmp.prevAct);
|
|
return *this;
|
|
}
|
|
|
|
~PushActivity()
|
|
{
|
|
if (prevAct) {
|
|
setCurActivity(*prevAct);
|
|
}
|
|
}
|
|
};
|
|
|
|
extern Logger * logger;
|
|
|
|
Logger * makeSimpleLogger(bool printBuildLogs = true);
|
|
|
|
Logger * makeJSONLogger(Logger & prevLogger);
|
|
|
|
/**
|
|
* suppress msgs > this
|
|
*/
|
|
extern Verbosity verbosity;
|
|
|
|
/**
|
|
* Print a message with the standard ErrorInfo format.
|
|
* In general, use these 'log' macros for reporting problems that may require user
|
|
* intervention or that need more explanation. Use the 'print' macros for more
|
|
* lightweight status messages.
|
|
*/
|
|
#define logErrorInfo(level, errorInfo...) \
|
|
do { \
|
|
if ((level) <= nix::verbosity) { \
|
|
logger->logEI((level), errorInfo); \
|
|
} \
|
|
} while (0)
|
|
|
|
#define logError(errorInfo...) logErrorInfo(lvlError, errorInfo)
|
|
#define logWarning(errorInfo...) logErrorInfo(lvlWarn, errorInfo)
|
|
|
|
/**
|
|
* Print a string message if the current log level is at least the specified
|
|
* level. Note that this has to be implemented as a macro to ensure that the
|
|
* arguments are evaluated lazily.
|
|
*/
|
|
#define printMsgUsing(loggerParam, level, args...) \
|
|
do { \
|
|
auto _lix_logger_print_lvl = level; \
|
|
if (_lix_logger_print_lvl <= nix::verbosity) { \
|
|
loggerParam->log(_lix_logger_print_lvl, fmt(args)); \
|
|
} \
|
|
} while (0)
|
|
#define printMsg(level, args...) printMsgUsing(logger, level, args)
|
|
|
|
#define printError(args...) printMsg(lvlError, args)
|
|
#define notice(args...) printMsg(lvlNotice, args)
|
|
#define printInfo(args...) printMsg(lvlInfo, args)
|
|
#define printTalkative(args...) printMsg(lvlTalkative, args)
|
|
#define debug(args...) printMsg(lvlDebug, args)
|
|
#define vomit(args...) printMsg(lvlVomit, args)
|
|
|
|
/**
|
|
* if verbosity >= lvlWarn, print a message with a yellow 'warning:' prefix.
|
|
*/
|
|
template<typename... Args>
|
|
inline void warn(const std::string & fs, const Args & ... args)
|
|
{
|
|
logger->warn(HintFmt(fs, args...).str());
|
|
}
|
|
|
|
void writeLogsToStderr(std::string_view s);
|
|
|
|
/** Logs a fatal message as loudly as possible. This will go into syslog as well as stderr.
|
|
* The purpose of this function is making failures with redirected stderr louder. */
|
|
void logFatal(std::string const & s);
|
|
|
|
/**
|
|
* @param source A noun phrase describing the source of the message, e.g. "the builder".
|
|
*/
|
|
std::optional<JSON> parseJSONMessage(const std::string & msg, std::string_view source);
|
|
|
|
/**
|
|
* @param source A noun phrase describing the source of the message, e.g. "the builder".
|
|
*/
|
|
bool handleJSONLogMessage(JSON & json,
|
|
const Activity & act, std::map<ActivityId, Activity> & activities,
|
|
std::string_view source,
|
|
bool trusted);
|
|
|
|
/**
|
|
* @param source A noun phrase describing the source of the message, e.g. "the builder".
|
|
*/
|
|
bool handleJSONLogMessage(const std::string & msg,
|
|
const Activity & act, std::map<ActivityId, Activity> & activities,
|
|
std::string_view source,
|
|
bool trusted);
|
|
|
|
}
|