diff --git a/src/laminar.cpp b/src/laminar.cpp index 5b8de1a..e9804f3 100644 --- a/src/laminar.cpp +++ b/src/laminar.cpp @@ -177,7 +177,6 @@ void Laminar::sendStatus(LaminarClient* client) { j.set("queued", started-queued); j.set("started", started); j.set("completed", completed); - j.set("duration", completed-started); j.set("result", to_string(RunState(result))); j.set("reason", reason); }); @@ -203,7 +202,7 @@ void Laminar::sendStatus(LaminarClient* client) { .fetch([&](int build,time_t started,time_t completed,int result,str reason){ j.StartObject(); j.set("number", build) - .set("duration", completed - started) + .set("completed", completed) .set("started", started) .set("result", to_string(RunState(result))) .set("reason", reason) @@ -268,8 +267,8 @@ void Laminar::sendStatus(LaminarClient* client) { j.set("name", name) .set("number", build) .set("node", node) - .set("duration", completed - started) .set("started", started) + .set("completed", completed) .set("result", to_string(RunState(result))) .EndObject(); }); @@ -706,7 +705,6 @@ void Laminar::runFinished(Run * r) { .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)) .set("reason", r->reason()); diff --git a/src/resources/index.html b/src/resources/index.html index 5eb710e..4049f65 100644 --- a/src/resources/index.html +++ b/src/resources/index.html @@ -54,7 +54,7 @@ - {{job.name}} #{{job.number}}
Took {{job.duration}}s at {{formatDate(job.started)}} + {{job.name}} #{{job.number}}
Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}} diff --git a/src/resources/js/app.js b/src/resources/js/app.js index f0a4b47..4bc03a6 100644 --- a/src/resources/js/app.js +++ b/src/resources/js/app.js @@ -330,7 +330,7 @@ var Job = function() { fillColor: "darkseagreen", strokeColor: "forestgreen", data: msg.recent.map(function(e) { - return e.duration; + return e.completed - e.started; }).reverse() }] }, {