wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Don't create a Store in processConnection()

Browse source
This commit is contained in:
Eelco Dolstra 2018-09-25 12:49:20 +02:00
parent 63b99af85a
commit 05819d013f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/nix-daemon/nix-daemon.cc
View file

@ -140,6 +140,15 @@ static PeerInfo getPeerInfo(int remote)
#define SD_LISTEN_FDS_START 3
static ref<Store> openUncachedStore()
{
Store::Params params; // FIXME: get params from somewhere
// Disable caching since the client already does that.
params["path-info-cache-size"] = "0";
return openStore(settings.storeUri, params);
}
static void daemonLoop(char * * argv)
{
if (chdir("/") == -1)
@ -230,7 +239,7 @@ static void daemonLoop(char * * argv)
/* Handle the connection. */
FdSource from(remote.get());
FdSink to(remote.get());
processConnection(from, to, trusted, user, peer.uid);
processConnection(openUncachedStore(), from, to, trusted, user, peer.uid);
exit(0);
}, options);
@ -312,7 +321,7 @@ static int _main(int argc, char * * argv)
} else {
FdSource from(STDIN_FILENO);
FdSink to(STDOUT_FILENO);
processConnection(from, to, true, "root", 0);
processConnection(openUncachedStore(), from, to, true, "root", 0);
}
} else {
daemonLoop(argv);