diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-20T02·28+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-20T11·48+0000 |
| commit | 33e8b0f975cd8934405c568cfa1d7e2a1edfa425 (patch) | |
| tree | 2d67c57661cd424bfe6c87d33c4d38212f9a4e3c /third_party/nix/src/libexpr | |
| parent | f7fa77f14dedad98ab9e8a014d3bcfd60565dfd0 (diff) | |
chore(tvix): Thread a std::ostream through Store::buildPaths r/1689
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>
Diffstat (limited to 'third_party/nix/src/libexpr')
| -rw-r--r-- | third_party/nix/src/libexpr/primops.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 7819dd4b1380..1684c20413c5 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -91,7 +91,12 @@ void EvalState::realiseContext(const PathSet& context) { unsigned long long narSize; store->queryMissing(drvs, willBuild, willSubstitute, unknown, downloadSize, narSize); - nix::util::OkOrThrow(store->buildPaths(drvs)); + + // TODO(tazjin): Figure out where these logs are supposed to go ... + // unless we keep a per-store stream open persistently there's no + // "generic" way to send logs anywhere for cases like this (IFD). + auto discard_logs = DiscardLogsSink(); + nix::util::OkOrThrow(store->buildPaths(discard_logs, drvs)); } /* Load and evaluate an expression from path specified by the |