From f16e24f95e7d7fa3a5c3b2c8d43d171fa5b9cf85 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 2 May 2020 10:58:33 +0200
Subject: [PATCH] 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
---
src/libstore/remote-store.cc | 6 ++++--
1 file 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);
--
GitLab