diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-11-27T19·49-0500 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-11-27T20·06+0000 |
| commit | afdf08ead56370efabd6e9e9e154fe013a428419 (patch) | |
| tree | 387163fb58282754e03bc2a484c1b25202e77c60 | |
| parent | db5290358104764155c53235394a07608d7fcf75 (diff) | |
fix(tvix): Remove more superfluous log output r/1940
- A couple of log messages had double-newlines still - Remove the [ drvPath ] bit from the "building path" output, since the derivation path is already present in the message itself. Change-Id: Ib4b514a18fcb63c7191f4d7cf0a9b857aaa3f3fa Reviewed-on: https://cl.tvl.fyi/c/depot/+/2171 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com>
| -rw-r--r-- | third_party/nix/src/libstore/build.cc | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libstore/rpc-store.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/build.cc b/third_party/nix/src/libstore/build.cc index 874b9d0e05..b8a661f278 100644 --- a/third_party/nix/src/libstore/build.cc +++ b/third_party/nix/src/libstore/build.cc @@ -1472,7 +1472,7 @@ void DerivationGoal::tryToBuild() { if (hook) { msg += fmt(" on '%s'", machineName); } - log_sink() << absl::StrCat(msg, "[", drvPath, "]\n") << std::endl; + log_sink() << msg << std::endl; mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds); }; diff --git a/third_party/nix/src/libstore/rpc-store.cc b/third_party/nix/src/libstore/rpc-store.cc index 5d0ec1f9eb..6bf58747d0 100644 --- a/third_party/nix/src/libstore/rpc-store.cc +++ b/third_party/nix/src/libstore/rpc-store.cc @@ -364,8 +364,7 @@ absl::Status RpcStore::buildPaths(std::ostream& log_sink, const PathSet& paths, // TODO(tazjin): Include .path()? log_sink << event.build_log().line(); } else { - log_sink << std::endl - << "Building path: " << event.building_path().path() + log_sink << "Building path: " << event.building_path().path() << std::endl; } |