diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-05-03 12:07:02 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-05-03 12:07:02 +0200 |
| commit | f5ab412da304e3970a6b5b3290758ed791c31881 (patch) | |
| tree | 28ddc870029302d6a26209dba0f73b3ce692744d /bbot/agent.cxx | |
| parent | fa5ebd101b792fdf038394f0aaa4a4ab8e28dab6 (diff) | |
Pass toolchain name/version to controller
Diffstat (limited to 'bbot/agent.cxx')
| -rw-r--r-- | bbot/agent.cxx | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/bbot/agent.cxx b/bbot/agent.cxx index 731a172..671f1c0 100644 --- a/bbot/agent.cxx +++ b/bbot/agent.cxx @@ -43,9 +43,10 @@ namespace bbot const string bs_prot ("1"); - string tc_name; - uint16_t tc_num; - string tc_id; + string tc_name; + uint16_t tc_num; + standard_version tc_ver; + string tc_id; string hname; uid_t uid; @@ -802,6 +803,9 @@ try tc_name = ops.toolchain_name (); tc_num = ops.toolchain_num (); + tc_ver = (ops.toolchain_ver_specified () + ? ops.toolchain_ver () + : standard_version (BBOT_VERSION_STR)); tc_id = ops.toolchain_id (); @@ -834,6 +838,7 @@ try dr << info << "bbot agent " << BBOT_VERSION_ID << info << "toolchain name " << tc_name << info << "toolchain num " << tc_num << + info << "toolchain ver " << tc_ver.string () << info << "toolchain id " << tc_id << info << "CPU(s) " << ops.cpu () << info << "RAM(kB) " << ops.ram (); @@ -865,7 +870,13 @@ try // // @@ TODO: key fingerprint. // - task_request_manifest tq {hname, nullopt, machine_header_manifests {}}; + task_request_manifest tq { + hname, + tc_name, + tc_ver, + nullopt, + machine_header_manifests {} + }; for (const bootstrapped_machine_manifest& m: ms) tq.machines.emplace_back (m.machine.id, |