lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revert "Merge pull request #3558 from LnL7/ssh-ng-stderr"

Browse source 
This reverts commit 3ebfbecdd1, reversing
changes made to c089c52d5f.

https://github.com/NixOS/nix/pull/3558
This commit is contained in:
Eelco Dolstra 2020-05-06 10:54:01 +02:00
parent 909b4a8820
commit fd4911269f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/remote-store.cc
View file

@ -779,10 +779,8 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
return std::make_exception_ptr(Error(status, error)); return std::make_exception_ptr(Error(status, error));
} }
else if (msg == STDERR_NEXT) { else if (msg == STDERR_NEXT)
string s = chomp(readString(from)); printError(chomp(readString(from)));
printMsg(lvlVomit, "stderr %s", s);
}
else if (msg == STDERR_START_ACTIVITY) { else if (msg == STDERR_START_ACTIVITY) {
auto act = readNum<ActivityId>(from); auto act = readNum<ActivityId>(from);

10
src/libutil/logging.cc
View file

@ -63,16 +63,6 @@ public:
writeToStderr(prefix + filterANSIEscapes(fs.s, !tty) + "\n"); writeToStderr(prefix + filterANSIEscapes(fs.s, !tty) + "\n");
} }
void result(ActivityId act, ResultType type, const std::vector<Field> & fields) override
{
if (type == resBuildLogLine || type == resPostBuildLogLine) {
assert(0 < fields.size());
assert(fields[0].type == Logger::Field::tString);
auto lastLine = fields[0].s;
log(lvlInfo, lastLine);
}
}
void startActivity(ActivityId act, Verbosity lvl, ActivityType type, void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent) const std::string & s, const Fields & fields, ActivityId parent)
override override