Skip to content

Commit

Permalink
Merge pull request #285 from TencentBlueKing/develop
Browse files Browse the repository at this point in the history
fix: bugfix long task model import error (#284)
  • Loading branch information
zhu327 authored Oct 20, 2021
2 parents 127bb99 + 2f3384f commit dd21fbb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
5 changes: 5 additions & 0 deletions release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# V1.5.9

### 缺陷修复
* 修复长时任务获取结果报错

# V1.5.8

### 功能优化
Expand Down
2 changes: 1 addition & 1 deletion saas/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.8
1.5.9
4 changes: 2 additions & 2 deletions saas/backend/long_task/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def results(self):

# 运行中的任务, 实时从redis中取结果
if self.status == TaskStatus.RUNNING.value:
from .task import ResultStore
from .tasks import ResultStore

store = ResultStore(self.id)
results += store.list()
Expand Down Expand Up @@ -85,7 +85,7 @@ def _create(cls, type_: str, args: List[Any], sign: str = ""):

task.save(force_insert=True)

# from .task import TaskFactory
# from .tasks import TaskFactory

# TaskFactory().delay(task.id) # NOTE 保证事务执行完成以后再执行任务
return task
Expand Down
4 changes: 4 additions & 0 deletions saas/resources/version_log/V1.5.9_2021-10-20.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# V1.5.9 版本更新日志

### 缺陷修复
* 修复长时任务获取结果报错
4 changes: 4 additions & 0 deletions saas/resources/version_log/V1.5.9_2021-10-20_en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# V1.5.9 ChangeLog

### Bug Fixes
* Fix long task get results error

0 comments on commit dd21fbb

Please sign in to comment.