Merge branch 'custom-channels' of https://github.com/aszlig/hydra

2015-10-16 17:00:29 +02:00
parent 4759323514 92e85f05e2
commit 30823078c4
17 changed files with 233 additions and 50 deletions
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@ -129,6 +129,7 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
            res.attr("schedulingPriority", drv.queryMetaInt("schedulingPriority", 100));
            res.attr("timeout", drv.queryMetaInt("timeout", 36000));
            res.attr("maxSilent", drv.queryMetaInt("maxSilent", 7200));
+            res.attr("isChannel", drv.queryMetaBool("isHydraChannel", false));

            /* If this is an aggregate, then get its constituents. */
            Bindings::iterator a = v.attrs->find(state.symbols.create("_hydraAggregate"));