maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initialise logger

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-12 14:52:49 +02:00
parent 16c4856027
commit 31cc9366fc
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ static ref<Store> store()
static std::shared_ptr<Store> _store; static std::shared_ptr<Store> _store;
if (!_store) { if (!_store) {
try { try {
logger = makeDefaultLogger();
settings.loadConfFile(); settings.loadConfFile();
settings.update(); settings.update();
settings.lockCPU = false; settings.lockCPU = false;

2
src/libmain/shared.cc
View file

@ -106,8 +106,6 @@ void initNix()
std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf)); std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));
#endif #endif
logger = makeDefaultLogger();
/* Initialise OpenSSL locking. */ /* Initialise OpenSSL locking. */
opensslLocks = std::vector<std::mutex>(CRYPTO_num_locks()); opensslLocks = std::vector<std::mutex>(CRYPTO_num_locks());
CRYPTO_set_locking_callback(opensslLockCallback); CRYPTO_set_locking_callback(opensslLockCallback);

2
src/libutil/logging.cc
View file

@ -3,7 +3,7 @@
namespace nix { namespace nix {
Logger * logger = 0; Logger * logger = makeDefaultLogger();
class SimpleLogger : public Logger class SimpleLogger : public Logger
{ {