shuffle around a bit

DeterminateSystems · Feb 17, 2025 · fa495e7 · fa495e7
1 parent 0bbeb15
commit fa495e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
@@ -1045,7 +1045,7 @@ void processConnection(
     auto prevLogger = nix::logger;
     // FIXME
     if (!recursive)
-        logger = tunnelLogger;
+        logger = makeTeeLogger({tunnelLogger, nix::logger});
 
     unsigned int opCount = 0;
 

diff --git a/src/nix/main.cc b/src/nix/main.cc
@@ -352,9 +352,6 @@ static auto rCmdHelpStores = registerCommand<CmdHelpStores>("help-stores");
 
 void mainWrapped(int argc, char * * argv)
 {
-    if (auto logFile = getEnv("NIX_LOG_FILE")) {
-        logger = makeTeeLogger({logger, makeJSONLogger(*logFile)});
-    }
 
     savedArgv = argv;
 
@@ -392,6 +389,10 @@ void mainWrapped(int argc, char * * argv)
     }
     #endif
 
+    if (auto logFile = getEnv("NIX_LOG_FILE")) {
+        logger = makeTeeLogger({logger, makeJSONLogger(*logFile)});
+    }
+
     Finally f([] { logger->stop(); });
 
     programPath = argv[0];