aboutsummaryrefslogtreecommitdiff
path: root/src/nix-daemon
diff options
context:
space:
mode:
Diffstat (limited to 'src/nix-daemon')
-rw-r--r--src/nix-daemon/nix-daemon.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 9f1d619e5..dbf301a91 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -149,12 +149,17 @@ struct TunnelLogger : public Logger
}
}
- void startActivity(ActivityId act, ActivityType type,
+ void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
const std::string & s, const Fields & fields, ActivityId parent) override
{
- if (GET_PROTOCOL_MINOR(clientVersion) < 20) return;
+ if (GET_PROTOCOL_MINOR(clientVersion) < 20) {
+ if (!s.empty())
+ log(lvl, s + "...");
+ return;
+ }
+
StringSink buf;
- buf << STDERR_START_ACTIVITY << act << type << s << fields << parent;
+ buf << STDERR_START_ACTIVITY << act << lvl << type << s << fields << parent;
enqueueMsg(*buf.s);
}