Skip to content

P
power-node
Commit 82f6130e authored by duanjinfei's avatar duanjinfei
Browse files
Options

update task handler

parent 2d1e5225
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 4 deletions
nm/task_msg.go
View file @ 82f6130e
...@@ -286,12 +286,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -286,12 +286,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
for _, innerSlice := range res { for _, innerSlice := range res {
apiResOneArr := make([]string, 0) apiResOneArr := make([]string, 0)
for _, respStr := range innerSlice { for _, respStr := range innerSlice {
if !isUseFileCache {
apiResOneArr = append(apiResOneArr, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
apiResOneArr = append(apiResOneArr, respStr) apiResOneArr = append(apiResOneArr, respStr)
continue continue
} }
if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 && isUseFileCache { if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri) post.Header.Set("Location", ossUri)
break break
...@@ -312,17 +316,21 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -312,17 +316,21 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
log.Info("data is []string type") log.Info("data is []string type")
apiRes := make([]string, 0) apiRes := make([]string, 0)
for _, respStr := range res { for _, respStr := range res {
if !isUseFileCache {
apiRes = append(apiRes, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
apiRes = append(apiRes, respStr) apiRes = append(apiRes, respStr)
continue continue
} }
if ossUri != "" && len(res) == 1 && isUseFileCache { if ossUri != "" && len(res) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri) post.Header.Set("Location", ossUri)
break break
} else { } else {
apiRes = append(apiRes, respStr) apiRes = append(apiRes, ossUri)
} }
} }
if len(apiRes) > 1 { if len(apiRes) > 1 {
...@@ -337,12 +345,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -337,12 +345,16 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
resArr := []string{resStr} resArr := []string{resStr}
apiRes := make([]string, 0) apiRes := make([]string, 0)
for _, respStr := range resArr { for _, respStr := range resArr {
if !isUseFileCache {
apiRes = append(apiRes, respStr)
continue
}
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
apiRes = append(apiRes, respStr) apiRes = append(apiRes, respStr)
continue continue
} }
if ossUri != "" && len(resArr) == 1 && isUseFileCache { if ossUri != "" && len(resArr) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri) post.Header.Set("Location", ossUri)
break 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