fix incorrect dtle node info #1037

and compare api host with ApiAddr instead of NomadAddr to avoid extra forwarding.

Author: ffffwh

api/handler/v2/job.go

@@ -1123,8 +1123,10 @@ func buildJobDetailResp(nomadJob nomadApi.Job, nomadAllocations []nomadApi.Alloc
 			taskType := common.TaskTypeFromString(t.Name)
 			switch taskType {
 			case common.TaskTypeSrc:
-				srcTaskDetail = buildSrcTaskDetail(t.Name, internalTaskConfig, taskGroupToNomadAlloc[*tg.Name])
-				destTaskDetail = buildMysqlDestTaskDetail(t.Name, internalTaskConfig, taskGroupToNomadAlloc[*tg.Name])
+				srcTaskDetail = buildSrcTaskDetail(
+					common.TaskTypeSrc, internalTaskConfig, taskGroupToNomadAlloc[common.TaskTypeSrc])
+				destTaskDetail = buildMysqlDestTaskDetail(
+					common.TaskTypeDest, internalTaskConfig, taskGroupToNomadAlloc[common.TaskTypeDest])
 				break
 			case common.TaskTypeDest:
 				break

api/handler/v2/monitor.go

@@ -67,8 +67,8 @@ func GetTaskProgressV2(c echo.Context) error {
 		return c.JSON(http.StatusInternalServerError, models.BuildBaseResp(fmt.Errorf("get target host failed: %v", err)))
 	}
 	logger.Info("got target host", "targetHost", targetHost)
-	selfNomadHost, _, err := net.SplitHostPort(handler.NomadHost)
-	if nil != err {
+	selfNomadHost, _, err := net.SplitHostPort(handler.ApiAddr)
+	if err != nil {
 		return c.JSON(http.StatusInternalServerError, models.BuildBaseResp(fmt.Errorf("get self nomad host failed: %v", err)))
 	}