move showTrace to new loggerSettings

src/libstore/daemon.cc

@@ -41,10 +41,9 @@ struct TunnelLogger : public Logger
     Sync<State> state_;
 
     unsigned int clientVersion;
-    bool showTrace;
 
     TunnelLogger(FdSink & to, unsigned int clientVersion)
-        : to(to), clientVersion(clientVersion), showTrace(false) { }
+        : to(to), clientVersion(clientVersion) { }
 
     void enqueueMsg(const std::string & s)
     {
@@ -86,13 +85,6 @@ struct TunnelLogger : public Logger
         enqueueMsg(*buf.s);
     }
 
-    bool getShowTrace() const override {
-        return showTrace;
-    }
-    void setShowTrace(bool showTrace) override {
-        this->showTrace = showTrace;
-    }
-
     /* startWork() means that we're starting an operation for which we
       want to send out stderr to the client. */
     void startWork()

src/libstore/globals.hh

@@ -196,10 +196,6 @@ public:
     /* Whether to lock the Nix client and worker to the same CPU. */
     bool lockCPU;
 
-    /* Whether to show a stack trace if Nix evaluation fails. */
-    Setting<bool> showTrace{this, false, "show-trace",
-        "Whether to show a stack trace on evaluation errors."};
-
     Setting<SandboxMode> sandboxMode{this,
         #if __linux__
           smEnabled

src/libstore/remote-store.cc

@@ -8,6 +8,7 @@
 #include "derivations.hh"
 #include "pool.hh"
 #include "finally.hh"
+#include "logging.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -197,7 +198,7 @@ void RemoteStore::setOptions(Connection & conn)
         overrides.erase(settings.maxSilentTime.name);
         overrides.erase(settings.buildCores.name);
         overrides.erase(settings.useSubstitutes.name);
-        overrides.erase(settings.showTrace.name);
+        overrides.erase(loggerSettings.showTrace.name);
         conn.to << overrides.size();
         for (auto & i : overrides)
             conn.to << i.first << i.second.value;