lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1292 from Ma27/fix-queue-runner-stats

Browse source 
hydra-queue-runner: fix stats
This commit is contained in:
Janne Heß 2023-07-17 09:56:05 +02:00 committed by GitHub
parent 526e8bd744 5c35d1be20
commit d135b123cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -618,7 +618,7 @@ void State::dumpStatus(Connection & conn)
} }
{ {
auto jobsets_json = statusJson["jobsets"] = json::object(); auto jobsets_json = json::object();
auto jobsets_(jobsets.lock()); auto jobsets_(jobsets.lock());
for (auto & jobset : *jobsets_) { for (auto & jobset : *jobsets_) {
jobsets_json[jobset.first.first + ":" + jobset.first.second] = { jobsets_json[jobset.first.first + ":" + jobset.first.second] = {
@ -626,10 +626,11 @@ void State::dumpStatus(Connection & conn)
{"seconds", jobset.second->getSeconds()}, {"seconds", jobset.second->getSeconds()},
}; };
} }
statusJson["jobsets"] = jobsets_json;
} }
{ {
auto machineTypesJson = statusJson["machineTypes"] = json::object(); auto machineTypesJson = json::object();
auto machineTypes_(machineTypes.lock()); auto machineTypes_(machineTypes.lock());
for (auto & i : *machineTypes_) { for (auto & i : *machineTypes_) {
auto machineTypeJson = machineTypesJson[i.first] = { auto machineTypeJson = machineTypesJson[i.first] = {
@ -642,6 +643,7 @@ void State::dumpStatus(Connection & conn)
if (i.second.running == 0) if (i.second.running == 0)
machineTypeJson["lastActive"] = std::chrono::system_clock::to_time_t(i.second.lastActive); machineTypeJson["lastActive"] = std::chrono::system_clock::to_time_t(i.second.lastActive);
} }
statusJson["machineTypes"] = machineTypesJson;
} }
auto store = getDestStore(); auto store = getDestStore();