Commit 6be8291f authored by duanjinfei's avatar duanjinfei

update return frontend exec error msg

parent c76f6bee
...@@ -304,7 +304,7 @@ func handlerMsg(nodeManager *models.NodeManagerClient, ...@@ -304,7 +304,7 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
if containerSign == nil || len(containerSign) == 0 { if containerSign == nil || len(containerSign) == 0 {
log.Error("Container signing failed................") log.Error("Container signing failed................")
isSuccess = false isSuccess = false
taskExecRes.TaskExecError = fmt.Sprintf("%s,%s", taskExecRes.TaskExecError, "Container sign failed") taskExecRes.TaskExecError = fmt.Sprintf("%s", "Container sign failed")
} }
reqHash, respHash, minerSign := taskMsgWorker.GetMinerSign(taskMsg, taskExecRes.TaskRespBody) reqHash, respHash, minerSign := taskMsgWorker.GetMinerSign(taskMsg, taskExecRes.TaskRespBody)
params := buildParams(taskMsg.TaskId, containerSign, minerSign, taskExecRes, isSuccess) params := buildParams(taskMsg.TaskId, containerSign, minerSign, taskExecRes, isSuccess)
......
...@@ -183,7 +183,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -183,7 +183,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
containerId, err := t.DockerOp.CreateAndStartContainer(taskCmd.ImageName, taskCmd.DockerCmd) containerId, err := t.DockerOp.CreateAndStartContainer(taskCmd.ImageName, taskCmd.DockerCmd)
if err != nil { if err != nil {
log.Errorf("Create and start container failed: %s", err.Error()) log.Errorf("Create and start container failed: %s", err.Error())
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Create and start container failed: %s", err.Error()) taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Create and start container failed", err.Error())
return return
} }
log.Infof("Started container with ID %s", containerId) log.Infof("Started container with ID %s", containerId)
...@@ -213,6 +213,11 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -213,6 +213,11 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
taskCmd.ApiUrl = fmt.Sprintf("%s?%s", taskCmd.ApiUrl, queryString) taskCmd.ApiUrl = fmt.Sprintf("%s?%s", taskCmd.ApiUrl, queryString)
} }
request, err := http.NewRequest("POST", taskCmd.ApiUrl, reqContainerBody) request, err := http.NewRequest("POST", taskCmd.ApiUrl, reqContainerBody)
if err != nil {
log.WithField("error:", err).Error("New container request failed")
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Http client new container request failed", err.Error())
return
}
request.Header.Set("Content-Type", "application/json") request.Header.Set("Content-Type", "application/json")
for key, value := range taskParam.Headers { for key, value := range taskParam.Headers {
if key == models.Prefer { if key == models.Prefer {
...@@ -233,7 +238,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -233,7 +238,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
_, err := url.Parse(m.WebHook) _, err := url.Parse(m.WebHook)
if err != nil { if err != nil {
log.WithError(err).Error("web hook url parse failed") log.WithError(err).Error("web hook url parse failed")
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "web hook url parse failed", err.Error()) taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Web hook url parse failed", err.Error())
return return
} }
} }
...@@ -241,11 +246,6 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -241,11 +246,6 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
} }
} }
if err != nil {
log.WithField("error:", err).Error("New container request failed")
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Http client post request container failed", err.Error())
return
}
post, err := t.HttpClient.Do(request) post, err := t.HttpClient.Do(request)
if err != nil { if err != nil {
log.WithField("error:", err).Error("Http client post request container failed") log.WithField("error:", err).Error("Http client post request container failed")
...@@ -292,7 +292,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -292,7 +292,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", taskExecResult.TaskExecError, err) taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Get file cache uri failed", err)
apiResOneArr = append(apiResOneArr, respStr) apiResOneArr = append(apiResOneArr, respStr)
apiResBody := utils.EncodeJsonEscapeHTML(apiRes) apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
taskExecResult.TaskRespBody = apiResBody taskExecResult.TaskRespBody = apiResBody
...@@ -327,7 +327,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -327,7 +327,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", taskExecResult.TaskExecError, err) taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Get file cache uri failed", err)
apiRes = append(apiRes, respStr) apiRes = append(apiRes, respStr)
apiResBody := utils.EncodeJsonEscapeHTML(apiRes) apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
taskExecResult.TaskRespBody = apiResBody taskExecResult.TaskRespBody = apiResBody
...@@ -361,7 +361,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -361,7 +361,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", taskExecResult.TaskExecError, err) taskExecResult.TaskExecError = fmt.Sprintf("%s,%s", "Get file cache uri failed", err)
apiRes = append(apiRes, respStr) apiRes = append(apiRes, respStr)
apiResBody := utils.EncodeJsonEscapeHTML(apiRes) apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
taskExecResult.TaskRespBody = apiResBody taskExecResult.TaskRespBody = apiResBody
......
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