Commit 82f6130e authored by duanjinfei's avatar duanjinfei

update task handler

parent 2d1e5225
......@@ -286,12 +286,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
for _, innerSlice := range res {
apiResOneArr := make([]string, 0)
for _, respStr := range innerSlice {
if !isUseFileCache {
apiResOneArr = append(apiResOneArr, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" {
apiResOneArr = append(apiResOneArr, respStr)
continue
}
if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 && isUseFileCache {
if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri)
break
......@@ -312,17 +316,21 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
log.Info("data is []string type")
apiRes := make([]string, 0)
for _, respStr := range res {
if !isUseFileCache {
apiRes = append(apiRes, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" {
apiRes = append(apiRes, respStr)
continue
}
if ossUri != "" && len(res) == 1 && isUseFileCache {
if ossUri != "" && len(res) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri)
break
} else {
apiRes = append(apiRes, respStr)
apiRes = append(apiRes, ossUri)
}
}
if len(apiRes) > 1 {
......@@ -337,12 +345,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
resArr := []string{resStr}
apiRes := make([]string, 0)
for _, respStr := range resArr {
if !isUseFileCache {
apiRes = append(apiRes, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" {
apiRes = append(apiRes, respStr)
continue
}
if ossUri != "" && len(resArr) == 1 && isUseFileCache {
if ossUri != "" && len(resArr) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri)
break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment