diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2020-05-02 10:58:33 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2020-05-02 23:40:50 +0200 |
commit | f16e24f95e7d7fa3a5c3b2c8d43d171fa5b9cf85 (patch) | |
tree | 4e77def062aa02e3c630b18d836d1b72e7bfc1ec | |
parent | 625868b33dab37c0750081843be8091e22808376 (diff) |
remote-store: don't log raw stderr by default
For remote stores the log messages are already forwarded as structured
STDERR_RESULT messages so the old format is duplicate information. But
still included with -vvv since it could be useful for debugging
problems.
$ nix build -L /nix/store/nl71b2niws857ffiaggyrkjwgx9jjzc0-foo.drv --store ssh-ng://localhost
Hello World!
foo> Hello World!
[1/0/1 built] building foo
Fixes #3556
-rw-r--r-- | src/libstore/remote-store.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 8c55da268..07ef79382 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -779,8 +779,10 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source * return std::make_exception_ptr(Error(status, error)); } - else if (msg == STDERR_NEXT) - printError(chomp(readString(from))); + else if (msg == STDERR_NEXT) { + string s = chomp(readString(from)); + printMsg(lvlVomit, "stderr %s", s); + } else if (msg == STDERR_START_ACTIVITY) { auto act = readNum<ActivityId>(from); |