Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2026-11-02 00:29:32 +00:00
Code Issues Projects Releases Wiki Activity

FE cleanup, send missing messages

Browse Source
This commit is contained in:
Oliver Giles
2015-11-01 11:34:18 +01:00
parent 16081adb30
commit cb954f0ff8
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/laminar.cpp
View File

@@ -184,6 +184,7 @@ void Laminar::sendStatus(LaminarClient* client) {
j.set("number", run->build);
j.set("node", run->node->name);
j.set("started", run->startedAt);
j.set("reason", run->reason());
j.EndObject();
}
j.EndArray();
@@ -245,6 +246,11 @@ void Laminar::sendStatus(LaminarClient* client) {
j.set("number", run->build);
j.set("node", run->node->name);
j.set("started", run->startedAt);
db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
.bind(run->name)
.fetch<int>([&](int etc){
j.set("etc", time(0) + etc);
});
j.EndObject();
}
j.EndArray();
@@ -585,6 +591,7 @@ void Laminar::assignNewJobs() {
.startObject("data")
.set("queueIndex", std::distance(it,queuedJobs.begin()))
.set("name", run->name)
.set("queued", run->startedAt - run->queuedAt)
.set("started", run->startedAt)
.set("number", run->build)
.set("reason", run->reason());
@@ -644,6 +651,8 @@ void Laminar::runFinished(const Run * r) {
.startObject("data")
.set("name", r->name)
.set("number", r->build)
.set("queued", r->startedAt - r->queuedAt)
.set("completed", completedAt)
.set("duration", completedAt - r->startedAt)
.set("started", r->startedAt)
.set("result", to_string(r->result))