From bbfc47e96dcef901588e989a57a9d608eadafb26 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 27 Nov 2020 14:51:18 -0500 Subject: feat(tvix): Write build logs to LOG(INFO) in buildDerivation This was referencing a nonexistent note in buildPaths, for one, but for another let's get log outputs when calling this RPC. Change-Id: Ic9d17834b356ea84d69692ccc0249d09777e833b Reviewed-on: https://cl.tvl.fyi/c/depot/+/2173 Tested-by: BuildkiteCI Reviewed-by: kanepyork --- third_party/nix/src/libstore/rpc-store.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'third_party/nix/src') diff --git a/third_party/nix/src/libstore/rpc-store.cc b/third_party/nix/src/libstore/rpc-store.cc index 6bf58747d0ff..afaeca4a660e 100644 --- a/third_party/nix/src/libstore/rpc-store.cc +++ b/third_party/nix/src/libstore/rpc-store.cc @@ -384,9 +384,6 @@ BuildResult RpcStore::buildDerivation(const Path& drvPath, *request.mutable_derivation() = proto_drv; request.set_build_mode(BuildModeToProto(buildMode)); - // Same note as in ::buildPaths ... - std::ostream discard_logs = DiscardLogsSink(); - std::unique_ptr> reader = stub_->BuildDerivation(&ctx, request); @@ -395,7 +392,7 @@ BuildResult RpcStore::buildDerivation(const Path& drvPath, proto::BuildEvent event; while (reader->Read(&event)) { if (event.has_build_log()) { - discard_logs << event.build_log().line(); + LOG(INFO) << event.build_log().line(); } else if (event.has_result()) { result = BuildResult::FromProto(event.result()); } -- cgit 1.4.1