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

readability: move runFinished into its own function

Browse Source
This commit is contained in:
Oliver Giles 2015-09-19 15:41:19 +02:00
parent 50dd7b47af
commit dbc75000a5
2 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/laminar.cpp
View File

@ -496,42 +496,7 @@ void Laminar::assignNewJobs() {
} }
// setup run completion handler // setup run completion handler
run->notifyCompletion = [=,&node](const Run* r) { run->notifyCompletion = [this](const Run* r) { runFinished(r); };
node.busyExecutors--;
KJ_LOG(INFO, "Run completed", r->name, to_string(r->result));
time_t completedAt = time(0);
db->stmt("INSERT INTO builds VALUES(?,?,?,?,?,?,?,?,?,?,?)")
.bind(r->name, r->build, node.name, r->queuedAt, r->startedAt, completedAt, int(r->result),
r->log, r->parentName, r->parentBuild, r->reason())
.exec();
// notify clients
Json j;
j.set("type", "job_completed")
.startObject("data")
.set("name", r->name)
.set("number", r->build)
.set("duration", completedAt - r->startedAt)
.set("started", r->startedAt)
.set("result", to_string(r->result))
.EndObject();
const char* msg = j.str();
for(LaminarClient* c : clients) {
if(c->scope.wantsStatus(r->name, r->build))
c->sendMessage(msg);
}
// wake the waiters
for(Waiter& waiter : waiters[r])
waiter.release(r->result);
waiters.erase(r);
// remove the workdir
fs::remove_all(wd);
// will delete the job
activeJobs.get<2>().erase(r);
};
// trigger the first step of the run // trigger the first step of the run
if(stepRun(run)) { if(stepRun(run)) {
@ -552,3 +517,42 @@ void Laminar::assignNewJobs() {
} }
} }
void Laminar::runFinished(const Run * r) {
Node* node = r->node;
node->busyExecutors--;
KJ_LOG(INFO, "Run completed", r->name, to_string(r->result));
time_t completedAt = time(0);
db->stmt("INSERT INTO builds VALUES(?,?,?,?,?,?,?,?,?,?,?)")
.bind(r->name, r->build, node->name, r->queuedAt, r->startedAt, completedAt, int(r->result),
r->log, r->parentName, r->parentBuild, r->reason())
.exec();
// notify clients
Json j;
j.set("type", "job_completed")
.startObject("data")
.set("name", r->name)
.set("number", r->build)
.set("duration", completedAt - r->startedAt)
.set("started", r->startedAt)
.set("result", to_string(r->result))
.EndObject();
const char* msg = j.str();
for(LaminarClient* c : clients) {
if(c->scope.wantsStatus(r->name, r->build))
c->sendMessage(msg);
}
// wake the waiters
for(Waiter& waiter : waiters[r])
waiter.release(r->result);
waiters.erase(r);
// remove the workdir
fs::remove_all(r->wd);
// will delete the job
activeJobs.get<2>().erase(r);
}

1
src/laminar.h
View File

@ -59,6 +59,7 @@ private:
void reapAdvance(); void reapAdvance();
void assignNewJobs(); void assignNewJobs();
bool stepRun(std::shared_ptr<Run> run); bool stepRun(std::shared_ptr<Run> run);
void runFinished(const Run*);
std::list<std::shared_ptr<Run>> queuedJobs; std::list<std::shared_ptr<Run>> queuedJobs;