grahamc/hydra2 - Change SGFLU2VSP5ZBZ5J22XZHFYS2KQBUFQ6NIIIP42GGYVSIQMRPMUXAC

USER -> LOGNAME for consistency

Don't remember why we use LOGNAME. Also ensure that it's set.

Created by Eelco Dolstra on October 18, 2017

SGFLU2VSP5ZBZ5J22XZHFYS2KQBUFQ6NIIIP42GGYVSIQMRPMUXAC

Dependencies

In channels

main

Change contents

Insertion in src/hydra-queue-runner/hydra-queue-runner.cc at line 83 [4.4840]

[3.1365]

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;
}

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 98 [4.4840]

B:BD[5.775] → [2.116:250]

    , rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnv("USER"))))

[5.775]

[3.1572]

    , rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnvOrDie("LOGNAME"))))

Replacement in src/hydra-queue-runner/hydra-queue-runner.cc at line 102 [4.4840]

B:BD[3.1652] → [3.1652:1755]

    hydraData = getEnv("HYDRA_DATA");
    if (hydraData == "") throw Error("$HYDRA_DATA must be set");

[3.1652]

[6.3938]

    hydraData = getEnvOrDie("HYDRA_DATA");