合并前复核:补齐急停释放、整轮中止和计划任务时限
This commit is contained in:
+3
-1
@@ -12,6 +12,7 @@ import time
|
||||
from collections import deque
|
||||
|
||||
from .aalc_task import RESTORE_ENV
|
||||
from .killswitch import EXIT_CODE as USER_ABORT_EXIT
|
||||
|
||||
REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
IS_WIN = sys.platform.startswith('win')
|
||||
@@ -186,7 +187,8 @@ class TaskRunner:
|
||||
state = 'running'
|
||||
else:
|
||||
self.info.setdefault('ended', time.time())
|
||||
state = 'stopped' if self.info['stopped_by_user'] else 'succeeded' if code == 0 else 'failed'
|
||||
state = ('stopped' if self.info['stopped_by_user'] or code == USER_ABORT_EXIT
|
||||
else 'succeeded' if code == 0 else 'failed')
|
||||
r = {'ok': True, 'state': state, 'task': self.info['task'], 'params': self.info['params'],
|
||||
'elapsed_s': int((self.info.get('ended') or time.time()) - self.info['started']),
|
||||
'log': self.info['log'], 'log_tail': tail(self.info['log'], max(1, min(int(lines), 200)))}
|
||||
|
||||
Reference in New Issue
Block a user