USER -> LOGNAME for consistency

[?]
Oct 18, 2017, 9:23 AM
SGFLU2VSP5ZBZ5J22XZHFYS2KQBUFQ6NIIIP42GGYVSIQMRPMUXAC

Dependencies

  • [2] YXYXJDMB hydra-queue-runner: Write GC roots for outputs paths
  • [3] BG6PEOB2 Make the output size limit configurable
  • [4] NSBNNM77 Add hydra.conf option "nar_buffer_size" to configure memoryTokens limit
  • [5] IGLIPGT6 Make maxLogSize configurable
  • [6] EYIB6HA6 Supress debug message
  • [7] FHVJYJFE Upload build logs to the binary cache
  • [*] 24BMQDZA Start of single-process hydra-queue-runner

Change contents

  • edit in src/hydra-queue-runner/hydra-queue-runner.cc at line 83
    [3.1365]
    [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
    [3.775][2.116:250]()
    , rootsDir(config->getStrOption("gc_roots_dir", fmt("%s/gcroots/per-user/%s/hydra-roots", settings.nixStateDir, getEnv("USER"))))
    [3.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
    [3.1652][3.1652:1755]()
    hydraData = getEnv("HYDRA_DATA");
    if (hydraData == "") throw Error("$HYDRA_DATA must be set");
    [3.1652]
    [3.3938]
    hydraData = getEnvOrDie("HYDRA_DATA");