about summary refs log tree commit diff
path: root/third_party/nix/src/libstore/remote-store.cc
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-07-19T17·03+0100
committertazjin <mail@tazj.in>2020-07-19T19·02+0000
commit7a8880a0df579eeed7be2121dcd666cdb7e50f07 (patch)
treef6017b374e7979397941f61355cad33c18c7afd4 /third_party/nix/src/libstore/remote-store.cc
parent324d385b29979dee066a36250cfea9e030f24bfe (diff)
refactor(3p/nix): Remove remaining prefork-compat type r/1401
Removes the verbosity enum, which is no longer actively used anywhere
other than a daemon protocol implementation bit that doesn't actually
work.

Since the verbosity was marked deprecated, this removes one of the
last remaining warnings.

Change-Id: Iaee9d1d6c14b30daac83bb44bcacff32a0e07fb0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1289
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/src/libstore/remote-store.cc')
-rw-r--r--third_party/nix/src/libstore/remote-store.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc
index 7570255330c6..7c4f3a138fc0 100644
--- a/third_party/nix/src/libstore/remote-store.cc
+++ b/third_party/nix/src/libstore/remote-store.cc
@@ -19,7 +19,6 @@
 #include "libutil/archive.hh"
 #include "libutil/finally.hh"
 #include "libutil/pool.hh"
-#include "libutil/prefork-compat.hh"
 #include "libutil/serialise.hh"
 #include "libutil/util.hh"
 
@@ -167,14 +166,11 @@ void RemoteStore::initConnection(Connection& conn) {
 void RemoteStore::setOptions(Connection& conn) {
   conn.to << wopSetOptions << static_cast<uint64_t>(settings.keepFailed)
           << static_cast<uint64_t>(settings.keepGoing)
-          // TODO(tazjin): Remove the verbosity stuff here.
-          << static_cast<uint64_t>(settings.tryFallback) << compat::kInfo
-          << settings.maxBuildJobs << settings.maxSilentTime
-          << 1u
-          // TODO(tazjin): what behaviour does this toggle remotely?
-          << (settings.verboseBuild ? compat::kError : compat::kVomit)
-          << 0  // obsolete log type
-          << 0  /* obsolete print build trace */
+          << static_cast<uint64_t>(settings.tryFallback)
+          << /* previously: verbosity = */ 0 << settings.maxBuildJobs
+          << settings.maxSilentTime << 1u
+          << /* previously: remote verbosity = */ 0 << 0  // obsolete log type
+          << 0 /* obsolete print build trace */
           << settings.buildCores
           << static_cast<uint64_t>(settings.useSubstitutes);