feat(log): update log url for job (#1154)

PaddlePaddle · May 10, 2023 · 926e8f4 · 926e8f4
1 parent ad8ebfd
commit 926e8f4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/cmd/server/flag/flags.go b/cmd/server/flag/flags.go
@@ -182,12 +182,6 @@ func JobFlags(jobConf *config.JobConfig) []cli.Flag {
 			Usage:       "the salt of job log token",
 			Destination: &jobConf.Log.SaltStr,
 		},
-		&cli.StringFlag{
-			Name:        "log-time-format",
-			Value:       jobConf.Log.TimeFormat,
-			Usage:       "the time format of job log token",
-			Destination: &jobConf.Log.TimeFormat,
-		},
 	}
 }
 

diff --git a/pkg/apiserver/controller/job/get.go b/pkg/apiserver/controller/job/get.go
@@ -44,9 +44,8 @@ var (
 	}
 	UpdateTime = time.Now()
 
-	defaultSaltStr    = "paddleflow"
-	defaultTimeFormat = "2006-01-02 15"
-	LogURLFormat      = "http://%s:%s/v1/containers/%s/log?jobID=%s&token=%s"
+	defaultSaltStr = "paddleflow"
+	LogURLFormat   = "http://%s:%s/v1/containers/%s/log?jobID=%s&token=%s&t=%d"
 )
 
 func init() {
@@ -408,23 +407,20 @@ func GenerateLogURL(task model.JobTask) string {
 			containerID = items[1]
 		}
 	}
-	tokenStr := getLogToken(task.JobID, containerID)
+	tokenStr, t := getLogToken(task.JobID, containerID)
 	hash := md5.Sum([]byte(tokenStr))
 	token := hex.EncodeToString(hash[:])
 	log.Debugf("log url token for task %s/%s is %s", task.JobID, containerID, token)
 
 	return fmt.Sprintf(LogURLFormat, config.GlobalServerConfig.Job.Log.ServiceHost,
-		config.GlobalServerConfig.Job.Log.ServicePort, containerID, task.JobID, token)
+		config.GlobalServerConfig.Job.Log.ServicePort, containerID, task.JobID, token, t)
 }
 
-func getLogToken(jobID, containerID string) string {
+func getLogToken(jobID, containerID string) (string, int64) {
 	saltStr := config.GlobalServerConfig.Job.Log.SaltStr
 	if saltStr == "" {
 		saltStr = defaultSaltStr
 	}
-	timeFormat := config.GlobalServerConfig.Job.Log.TimeFormat
-	if timeFormat == "" {
-		timeFormat = defaultTimeFormat
-	}
-	return fmt.Sprintf("%s/%s/%s@%s", jobID, containerID, saltStr, time.Now().Format(timeFormat))
+	timeStamp := time.Now().Unix()
+	return fmt.Sprintf("%s/%s/%s@%d", jobID, containerID, saltStr, timeStamp), timeStamp
 }
diff --git a/pkg/apiserver/controller/job/get_test.go b/pkg/apiserver/controller/job/get_test.go
@@ -69,7 +69,7 @@ func TestGenerateLogURL(t *testing.T) {
 				ExtRuntimeStatusJSON: taskStatus,
 			},
 			containerID: "8517d2e225a5e580470d56c7e039208b538cb78b942cdabb028e235d1aee54b6",
-			expectURL:   "http://127.0.0.1:8080/v1/containers/%s/log?jobID=test-job-id&token=%s",
+			expectURL:   "http://127.0.0.1:8080/v1/containers/%s/log?jobID=test-job-id&token=%s&t=%d",
 		},
 	}
 
@@ -83,10 +83,11 @@ func TestGenerateLogURL(t *testing.T) {
 			assert.Equal(t, nil, err)
 			// generate log url
 			url := GenerateLogURL(task)
-			tokenStr := getLogToken(task.JobID, tc.containerID)
+			tokenStr, timeStamp := getLogToken(task.JobID, tc.containerID)
 			token := md5.Sum([]byte(tokenStr))
-			expectURL := fmt.Sprintf(tc.expectURL, tc.containerID, hex.EncodeToString(token[:]))
+			expectURL := fmt.Sprintf(tc.expectURL, tc.containerID, hex.EncodeToString(token[:]), timeStamp)
 			assert.Equal(t, expectURL, url)
+			t.Logf("log url %s", expectURL)
 		})
 	}
 }
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
@@ -116,7 +116,6 @@ type JobLogConfig struct {
 	ServiceHost string `yaml:"serviceHost"`
 	ServicePort string `yaml:"servicePort"`
 	SaltStr     string `yaml:"saltStr"`
-	TimeFormat  string `yaml:"timeFormat"`
 }
 
 type ImageConfig struct {