1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00

AC-620 Continue to update status while a task is running, so that long running tasks don't get inadvertently canceled.

This commit is contained in:
Chris Church 2013-11-21 17:58:36 -05:00
parent b59d9b766f
commit fc5c97d9ea

View File

@ -193,10 +193,11 @@ class BaseTask(Task):
#task_stdout_handle.write(logfile.getvalue()[old_logfile_pos:logfile_pos])
#task_stdout_handle.flush()
last_stdout_update = time.time()
instance = self.get_model(instance.pk)
# Commit transaction needed when running unit tests. FIXME: Is it
# needed or breaks anything for normal operation?
transaction.commit()
# Update instance status here (also updates modified timestamp, so
# we have a way to know the task is still running, otherwise the
# post_run_hook below would cancel long-running tasks that are
# really still active).
instance = self.update_model(instance.pk, status='running')
if instance.cancel_flag:
child.close(True)
canceled = True