aboutsummaryrefslogtreecommitdiff
path: root/src/nix-daemon/nix-daemon.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-19 17:09:27 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-19 17:09:27 +0100
commita3e5c99d66e111455c6ddc40759005718016c8dd (patch)
treecabfba77716ba25e6025105758ba86acce5dae3f /src/nix-daemon/nix-daemon.cc
parent1256ab3b446d8e35225c36e71abb50ee964ea050 (diff)
nix-daemon: Call exit(), not _exit()
This was preventing destructors from running. In particular, it was preventing the deletion of the temproot file for each worker process. It may also have been responsible for the excessive WAL growth on Hydra (due to the SQLite database not being closed properly). Apparently broken by accident in 8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74.
Diffstat (limited to 'src/nix-daemon/nix-daemon.cc')
-rw-r--r--src/nix-daemon/nix-daemon.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index d973e579f..3864ab935 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -820,8 +820,8 @@ static void daemonLoop(char * * argv)
to.fd = remote;
processConnection(trusted);
- _exit(0);
- }, false, "unexpected Nix daemon error: ");
+ exit(0);
+ }, false, "unexpected Nix daemon error: ", true);
} catch (Interrupted & e) {
throw;