nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-19 15:31:07 +01:00
Code Activity

move showTrace to new loggerSettings

Browse source
This commit is contained in:
Ben Burdette 2020-07-02 09:04:31 -06:00
parent 5ae498872a
commit bf2788e4c1
10 changed files with 35 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libmain/loggers.cc
View file

@ -22,11 +22,11 @@ LogFormat parseLogFormat(const std::string & logFormatStr) {
Logger * makeDefaultLogger() {
switch (defaultLogFormat) {
case LogFormat::raw:
return makeSimpleLogger(false, false);
return makeSimpleLogger(false);
case LogFormat::rawWithLogs:
return makeSimpleLogger(true, false);
return makeSimpleLogger(true);
case LogFormat::internalJson:
return makeJSONLogger(*makeSimpleLogger(true, false));
return makeJSONLogger(*makeSimpleLogger(true));
case LogFormat::bar:
return makeProgressBar();
case LogFormat::barWithLogs:

10
src/libmain/progress-bar.cc
View file

@ -81,14 +81,12 @@ private:
bool printBuildLogs;
bool isTTY;
bool showTrace;
public:
ProgressBar(bool printBuildLogs, bool isTTY)
: printBuildLogs(printBuildLogs)
, isTTY(isTTY)
, showTrace(false)
{
state_.lock()->active = isTTY;
updateThread = std::thread([&]() {
@ -133,16 +131,10 @@ public:
auto state(state_.lock());
std::stringstream oss;
showErrorInfo(oss, ei, showTrace);
showErrorInfo(oss, ei, loggerSettings.showTrace.get());
log(*state, ei.level, oss.str());
}
bool getShowTrace() const override {
return showTrace;
}
void setShowTrace(bool showTrace) override {
this->showTrace = showTrace;
}
void log(State & state, Verbosity lvl, const std::string & s)
{

3
src/libmain/shared.cc
View file

@ -323,9 +323,8 @@ int handleExceptions(const string & programName, std::function<void()> fun)
printError("Try '%1% --help' for more information.", programName);
return 1;
} catch (BaseError & e) {
logger->setShowTrace(settings.showTrace);
logError(e.info());
if (e.hasTrace() && !settings.showTrace)
if (e.hasTrace() && !loggerSettings.showTrace.get())
printError("(use '--show-trace' to show detailed location information)");
return e.status;
} catch (std::bad_alloc & e) {