maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix): Thread a std::ostream through Store::buildPaths

Browse source 
This part of the store API needs to carry a handle to the log sink
from now on, so that it can be passed in as appropriate from the gRPC
handlers.

In all places where there is no such handler available at the moment,
the discarding log sink has been inserted. This can be used as a
convenient grep target in the future.

Change-Id: I26628e30b4c6437dccdf8f722ca2e8ed827dfc19
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1797
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2020-08-20 03:28:35 +01:00 • committed by tazjin
parent f7fa77f14d
commit 33e8b0f975
15 changed files with 63 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
third_party/nix/src/libstore/rpc-store.cc vendored
View file

@ -4,6 +4,7 @@
#include <filesystem>
#include <memory>
#include <optional>
#include <ostream>
#include <absl/status/status.h>
#include <absl/strings/str_cat.h>
@ -318,7 +319,8 @@ Path RpcStore::addTextToStore(const std::string& name,
return result.path();
}
absl::Status RpcStore::buildPaths(const PathSet& paths, BuildMode buildMode) {
absl::Status RpcStore::buildPaths(std::ostream& log_sink, const PathSet& paths,
BuildMode build_mode) {
ClientContext ctx;
proto::BuildPathsRequest request;
for (const auto& path : paths) {
@ -326,14 +328,7 @@ absl::Status RpcStore::buildPaths(const PathSet& paths, BuildMode buildMode) {
}
google::protobuf::Empty response;
request.set_mode(nix::BuildModeToProto(buildMode));
// TODO(tazjin): Temporary no-op sink used to discard build output,
// but satisfy the compiler. A real one is needed.
//
// Maybe this should just be stderr, considering that this is the
// *client*, but I'm not sure.
std::ostream discard_logs = DiscardLogsSink();
request.set_mode(nix::BuildModeToProto(build_mode));
std::unique_ptr<grpc::ClientReader<proto::BuildEvent>> reader =
stub_->BuildPaths(&ctx, request);
@ -342,11 +337,11 @@ absl::Status RpcStore::buildPaths(const PathSet& paths, BuildMode buildMode) {
while (reader->Read(&event)) {
if (event.has_build_log()) {
// TODO(tazjin): Include .path()?
discard_logs << event.build_log().line();
log_sink << event.build_log().line();
} else {
discard_logs << std::endl
<< "Building path: " << event.building_path().path()
<< std::endl;
log_sink << std::endl
<< "Building path: " << event.building_path().path()
<< std::endl;
}
// has_result() is not in use in this call (for now)