lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move loadConfFile() to initLibStore

Browse source 
Part of an effort to make it easier to initialize the right things,
by moving code into the appropriate libraries.

Using libstore without loading the config file is risky, as sqlite
may then be misconfigured. See https://github.com/cachix/cachix/issues/475
This commit is contained in:
Robert Hensing 2023-02-01 16:46:26 +01:00
parent 6e0b7109ab
commit a692c43729
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
perl/lib/Nix/Store.xs
View file

@ -27,7 +27,6 @@ static ref<Store> store()
if (!_store) { if (!_store) {
try { try {
initLibStore(); initLibStore();
loadConfFile();
settings.lockCPU = false; settings.lockCPU = false;
_store = openStore(); _store = openStore();
} catch (Error & e) { } catch (Error & e) {

2
src/libmain/shared.cc
View file

@ -166,8 +166,6 @@ void initNix()
if (sodium_init() == -1) if (sodium_init() == -1)
throw Error("could not initialise libsodium"); throw Error("could not initialise libsodium");
loadConfFile();
startSignalHandlerThread(); startSignalHandlerThread();
/* Reset SIGCHLD to its default. */ /* Reset SIGCHLD to its default. */

3
src/libstore/globals.cc
View file

@ -291,6 +291,9 @@ void assertLibStoreInitialized() {
} }
void initLibStore() { void initLibStore() {
loadConfFile();
initLibStoreDone = true; initLibStoreDone = true;
} }