opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.fix corn run task with empyt context

Browse Source
This commit is contained in:
wanyaoqi
2018-08-15 21:52:24 +08:00
parent d44bb67d8c
commit 231e94fbd8
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/taskman/tasks.go
+12 -6
View File
@@ -246,17 +246,21 @@ func (manager *STaskManager) NewParallelTask(ctx context.Context, taskName strin
}
func (manager *STaskManager) fetchTask(idStr string) *STask {
task, err := db.NewModelObject(manager)
iTask, err := db.NewModelObject(manager)
if err != nil {
log.Errorf("New task object fail: %s", err)
return nil
}
err = manager.Query().Equals("id", idStr).First(task)
err = manager.Query().Equals("id", idStr).First(iTask)
if err != nil {
log.Errorf("GetTask %s fail: %s", idStr, err)
return nil
}
return task.(*STask)
task := iTask.(*STask)
if task.Params == nil {
task.Params = jsonutils.NewDict()
}
return task
}
func (manager *STaskManager) execTask(taskId string, data jsonutils.JSONObject) {
@@ -412,9 +416,11 @@ func (self *STask) GetParentTask() *STask {
func (self *STask) GetRequestContext() appctx.AppContextData {
ctxData := appctx.AppContextData{}
ctxJson, _ := self.Params.Get(REQUEST_CONTEXT_KEY)
if ctxJson != nil {
ctxJson.Unmarshal(&ctxData)
if self.Params != nil {
ctxJson, _ := self.Params.Get(REQUEST_CONTEXT_KEY)
if ctxJson != nil {
ctxJson.Unmarshal(&ctxData)
}
}
return ctxData
}