diff --git a/src/hydra-evaluator/hydra-evaluator.cc b/src/hydra-evaluator/hydra-evaluator.cc index f3397a7c..b3dec4ac 100644 --- a/src/hydra-evaluator/hydra-evaluator.cc +++ b/src/hydra-evaluator/hydra-evaluator.cc @@ -13,7 +13,7 @@ using namespace nix; -typedef std::pair JobsetName; +typedef std::pair JobsetIdentity; enum class EvaluationStyle { @@ -30,16 +30,16 @@ struct Evaluator struct Jobset { - JobsetName name; + JobsetIdentity name; std::optional evaluation_style; time_t lastCheckedTime, triggerTime; int checkInterval; Pid pid; }; - typedef std::map Jobsets; + typedef std::map Jobsets; - std::optional evalOne; + std::optional evalOne; const size_t maxEvals; @@ -76,10 +76,10 @@ struct Evaluator auto state(state_.lock()); - std::set seen; + std::set seen; for (auto const & row : res) { - auto name = JobsetName{row["project"].as(), row["name"].as()}; + auto name = JobsetIdentity{row["project"].as(), row["name"].as()}; if (evalOne && name != *evalOne) continue; @@ -466,7 +466,7 @@ int main(int argc, char * * argv) else { if (!args.empty()) { if (args.size() != 2) throw UsageError("Syntax: hydra-evaluator [ ]"); - evaluator.evalOne = JobsetName(args[0], args[1]); + evaluator.evalOne = JobsetIdentity(args[0], args[1]); } evaluator.run(); }