Commit 96e90c07 authored by duanjinfei's avatar duanjinfei

update use file cache

parent 68b1d9d1
......@@ -232,8 +232,8 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
}
log.WithField("isUseFileCache", isUseFileCache).Info("is use file cache")
if isUseFileCache && readBody != nil {
base64ImageStrArr := make([]string, 0)
if readBody != nil {
containerRespStrArr := make([]string, 0)
data := parseData(readBody)
if data != nil {
switch v := data.(type) {
......@@ -242,7 +242,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
res := data.([][]string)
for _, innerSlice := range res {
for _, str := range innerSlice {
base64ImageStrArr = append(base64ImageStrArr, str)
containerRespStrArr = append(containerRespStrArr, str)
}
}
log.Info("data is [][]string type")
......@@ -251,23 +251,23 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
{
res := data.([]string)
for _, slice := range res {
base64ImageStrArr = append(base64ImageStrArr, slice)
containerRespStrArr = append(containerRespStrArr, slice)
}
log.Info("data is []string type")
}
case string:
{
res := data.(string)
base64ImageStrArr = append(base64ImageStrArr, res)
containerRespStrArr = append(containerRespStrArr, res)
log.Info("data is string type")
}
default:
log.Error("data is unknown type", v)
}
apiRes := make([]string, 0)
for _, base64ImageStr := range base64ImageStrArr {
isBase64, decodeByte, respFormat, suffix := utils.IsBase64ImageStr(base64ImageStr)
if isBase64 {
for _, respStr := range containerRespStrArr {
isBase64, decodeByte, respFormat, suffix := utils.IsBase64ImageStr(respStr)
if isBase64 && isUseFileCache {
log.WithField("taskId", taskMsg.TaskId).WithField("format", respFormat).WithField("suffix", suffix).Info("Parse container resp")
queryString := utils.MatchFileCacheQueryString(taskParam.Headers, taskCmd.ImageName, t.DockerOp.ModelsInfo, respFormat)
ossUri, err := t.uploadOSS(taskMsg.TaskId, queryString, decodeByte, suffix)
......@@ -276,7 +276,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
return
}
log.WithField("uri", ossUri).Info("upload image OSS successful")
if ossUri != "" && len(base64ImageStrArr) == 1 {
if ossUri != "" && len(containerRespStrArr) == 1 {
taskExecResult.TaskHttpStatusCode = models.RedirectCode
post.Header.Set("Location", ossUri)
}
......@@ -284,7 +284,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
apiRes = append(apiRes, ossUri)
}
} else {
apiRes = append(apiRes, base64ImageStr)
apiRes = append(apiRes, respStr)
}
}
if len(apiRes) > 1 {
......
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