jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Nix daemon: reload the configuration file after forking (NIX-100).

Browse source
This commit is contained in:
Eelco Dolstra 2008-11-20 12:25:11 +00:00
parent c202523e53
commit a55113411f
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/globals.cc
View file

@ -119,4 +119,11 @@ unsigned int queryIntSetting(const string & name, unsigned int def)
} }
void reloadSettings()
{
settingsRead = false;
settings.clear();
}
} }

2
src/libstore/globals.hh
View file

@ -107,6 +107,8 @@ bool queryBoolSetting(const string & name, bool def);
unsigned int queryIntSetting(const string & name, unsigned int def); unsigned int queryIntSetting(const string & name, unsigned int def);
void reloadSettings();
} }

4
src/nix-worker/nix-worker.cc
View file

@ -635,6 +635,10 @@ static void daemonLoop()
/* Restore normal handling of SIGCHLD. */ /* Restore normal handling of SIGCHLD. */
setSigChldAction(false); setSigChldAction(false);
/* Since the daemon can be long-running, the
settings may have changed. So force a reload. */
reloadSettings();
/* Handle the connection. */ /* Handle the connection. */
from.fd = remote; from.fd = remote;
to.fd = remote; to.fd = remote;