lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

USER -> LOGNAME for consistency

Browse source 
Don't remember why we use LOGNAME. Also ensure that it's set.
This commit is contained in:
Eelco Dolstra 2017-10-18 11:23:00 +02:00
parent e70f9e872a
commit cc64e51f75
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -80,6 +80,14 @@ static uint64_t getMemSize()
} }
std::string getEnvOrDie(const std::string & key)
{
char * value = getenv(key.c_str());
if (!value) throw Error("environment variable '%s' is not set", key);
return value;
}
State::State() State::State()
: config(std::make_unique<::Config>()) : config(std::make_unique<::Config>())
, dbPool(config->getIntOption("max_db_connections", 128)) , dbPool(config->getIntOption("max_db_connections", 128))
@ -87,12 +95,11 @@ State::State()
, maxOutputSize(config->getIntOption("max_output_size", 2ULL << 30)) , maxOutputSize(config->getIntOption("max_output_size", 2ULL << 30))
, maxLogSize(config->getIntOption("max_log_size", 64ULL << 20)) , maxLogSize(config->getIntOption("max_log_size", 64ULL << 20))
, uploadLogsToBinaryCache(config->getBoolOption("upload_logs_to_binary_cache", false)) , uploadLogsToBinaryCache(config->getBoolOption("upload_logs_to_binary_cache", false))
, rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnv("USER")))) , rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnvOrDie("LOGNAME"))))
{ {
debug("using %d bytes for the NAR buffer", memoryTokens.capacity()); debug("using %d bytes for the NAR buffer", memoryTokens.capacity());
hydraData = getEnv("HYDRA_DATA"); hydraData = getEnvOrDie("HYDRA_DATA");
if (hydraData == "") throw Error("$HYDRA_DATA must be set");
logDir = canonPath(hydraData + "/build-logs"); logDir = canonPath(hydraData + "/build-logs");