NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 15:35:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix rollback when killing

Browse Source
This commit is contained in:
Antony Lesuisse 2014-06-03 22:40:41 +02:00
parent 73aef7f083
commit be9a8851d0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runbot/runbot.py
View File

@ -597,7 +597,7 @@ class runbot_build(osv.osv):
cmd += ['-d', '%s-all' % build.dest, '-i', mods, '--stop-after-init', '--log-level=test']
# reset job_start to an accurate job_20 job_time
build.write({'job_start': now()})
return self.spawn(cmd, lock_path, log_path, cpu_limit=1800)
return self.spawn(cmd, lock_path, log_path, cpu_limit=2100)
def job_30_run(self, cr, uid, build, lock_path, log_path):
# adjust job_end to record an accurate job_20 job_time
@ -679,6 +679,7 @@ class runbot_build(osv.osv):
'job_end': False,
}
build.write(values)
cr.commit()
else:
# check if current job is finished
lock_path = build.path('logs', '%s.lock' % build.job)
@ -686,7 +687,10 @@ class runbot_build(osv.osv):
# kill if overpassed
if build.job != jobs[-1] and build.job_time > 1800:
build.logger('%s time exceded (%ss)', build.job, build.job_time)
kill(build.pid)
try:
os.killpg(build.pid, signal.SIGKILL)
except OSError:
pass
continue
build.logger('%s finished', build.job)
# schedule