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

resolves #52: timeout prevents .after script

Browse Source 
Mark .after scripts as executing even after a timeout abort
This commit is contained in:
Oliver Giles
2018-09-09 12:15:23 +03:00
parent a2d30ad2ea
commit ab7be5a6c9
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/laminar.cpp
View File

@@ -587,7 +587,7 @@ void Laminar::notifyConfigChanged()
void Laminar::abortAll() {
for(std::shared_ptr<Run> run : activeJobs) {
run->abort();
run->abort(false);
}
}
@@ -674,13 +674,13 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
run->addScript((cfgDir/"jobs"/run->name+".run").string());
// job after-run script
if(fs::exists(cfgDir/"jobs"/run->name+".after"))
run->addScript((cfgDir/"jobs"/run->name+".after").string());
run->addScript((cfgDir/"jobs"/run->name+".after").string(), true);
// per-node after-run script
if(fs::exists(cfgDir/"nodes"/node->name+".after"))
run->addScript((cfgDir/"nodes"/node->name+".after").string());
run->addScript((cfgDir/"nodes"/node->name+".after").string(), true);
// global after-run script
if(fs::exists(cfgDir/"after"))
run->addScript((cfgDir/"after").string());
run->addScript((cfgDir/"after").string(), true);
// add environment files
if(fs::exists(cfgDir/"env"))
@@ -699,7 +699,7 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
// will be cancelled and the callback never called.
Run* r = run.get();
r->timeout = srv->addTimeout(timeout, [r](){
r->abort();
r->abort(true);
});
}
}