Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

fix reported estimated time of completion from websocket

Browse Source
This commit is contained in:
Oliver Giles 2017-07-13 21:58:39 +03:00
parent 492ddd2ceb
commit 8080d38cfe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/laminar.cpp
View File

@ -167,8 +167,8 @@ void Laminar::sendStatus(LaminarClient* client) {
j.set("result", to_string(RunState::RUNNING)); j.set("result", to_string(RunState::RUNNING));
db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1") db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
.bind(run->name) .bind(run->name)
.fetch<int>([&](int etc){ .fetch<int>([&](int lastRuntime){
j.set("etc", time(0) + etc); j.set("etc", run->startedAt + lastRuntime);
}); });
} }
j.set("latestNum", int(buildNums[client->scope.job])); j.set("latestNum", int(buildNums[client->scope.job]));
@ -262,8 +262,8 @@ void Laminar::sendStatus(LaminarClient* client) {
j.set("started", run->startedAt); j.set("started", run->startedAt);
db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1") db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
.bind(run->name) .bind(run->name)
.fetch<int>([&](int etc){ .fetch<int>([&](int lastRuntime){
j.set("etc", time(0) + etc); j.set("etc", run->startedAt + lastRuntime);
}); });
j.EndObject(); j.EndObject();
} }