diff --git a/pkg/microservice/jobexecutor/core/service/step/step.go b/pkg/microservice/jobexecutor/core/service/step/step.go index 8965f8001a..fe751a35a7 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step.go +++ b/pkg/microservice/jobexecutor/core/service/step/step.go @@ -142,7 +142,7 @@ func handleCmdOutput(pipe io.ReadCloser, needPersistentLog bool, logFile string, break } - fmt.Printf("%s %s", time.Now().Format(setting.WorkflowTimeFormat), maskSecretEnvs(string(lineBytes), secretEnvs)) + fmt.Printf("%s %s\n", time.Now().Format(setting.WorkflowTimeFormat), maskSecretEnvs(string(lineBytes), secretEnvs)) if needPersistentLog { err := util.WriteFile(logFile, lineBytes, 0700) diff --git a/pkg/microservice/jobexecutor/core/service/step/step_archive.go b/pkg/microservice/jobexecutor/core/service/step/step_archive.go index b6c3c94ff0..99054d60f5 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_archive.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_archive.go @@ -55,7 +55,7 @@ func NewArchiveStep(spec interface{}, workspace string, envs, secretEnvs []strin func (s *ArchiveStep) Run(ctx context.Context) error { start := time.Now() defer func() { - log.Infof("%s Archive ended. Duration: %.2f seconds", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) + log.Infof("Archive ended. Duration: %.2f seconds", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) }() for _, upload := range s.spec.UploadDetail { diff --git a/pkg/microservice/jobexecutor/core/service/step/step_debug.go b/pkg/microservice/jobexecutor/core/service/step/step_debug.go index 83c847ab64..97c2d7e2b9 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_debug.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_debug.go @@ -63,26 +63,26 @@ func (s *DebugStep) Run(ctx context.Context) (err error) { } cm.Data[types.JobDebugStatusKey] = s.Type if s.updater.UpdateWithRetry(cm, 3, 3*time.Second) != nil { - log.Errorf("%s debug step unexpected update configmap error: %v", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("debug step unexpected update configmap error: %v", err) return err } defer func() { cm, err = s.updater.Get() if err != nil { - log.Errorf("%s debug step unexpected get configmap error: %v", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("debug step unexpected get configmap error: %v", err) return } cm.Data[types.JobDebugStatusKey] = types.JobDebugStatusNotIn if s.updater.UpdateWithRetry(cm, 3, 3*time.Second) != nil { - log.Errorf("%s debug step unexpected update configmap error: %v", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("debug step unexpected update configmap error: %v", err) } }() - log.Infof("%s Running debugger %s job, Use debugger console.", time.Now().Format(setting.WorkflowTimeFormat), s.Type) + log.Infof("Running debugger %s job, Use debugger console.", s.Type) for _, err := os.Stat(path); err == nil; { time.Sleep(time.Second) _, err = os.Stat(path) } - log.Infof("%s debug step %s done", time.Now().Format(setting.WorkflowTimeFormat), s.Type) + log.Infof("debug step %s done", s.Type) return nil } diff --git a/pkg/microservice/jobexecutor/core/service/step/step_distribute_image.go b/pkg/microservice/jobexecutor/core/service/step/step_distribute_image.go index f3b7bd36b2..d080e53368 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_distribute_image.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_distribute_image.go @@ -26,7 +26,6 @@ import ( "time" "github.com/hashicorp/go-multierror" - "github.com/koderover/zadig/v2/pkg/setting" "gopkg.in/yaml.v2" "github.com/koderover/zadig/v2/pkg/tool/log" @@ -53,7 +52,7 @@ func NewDistributeImageStep(spec interface{}, workspace string, envs, secretEnvs } func (s *DistributeImageStep) Run(ctx context.Context) error { - log.Info("%s Start distribute images.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Start distribute images.") if s.spec.SourceRegistry == nil || s.spec.TargetRegistry == nil { return errors.New("image registry infos are missing") } @@ -84,7 +83,7 @@ func (s *DistributeImageStep) Run(ctx context.Context) error { appendError(errors.New(errMsg)) return } - log.Infof("%s pull source image [%s] succeed", time.Now().Format(setting.WorkflowTimeFormat), target.SourceImage) + log.Infof("pull source image [%s] succeed", target.SourceImage) tagCmd := dockerTagCmd(target.SourceImage, target.TargetImage) out = bytes.Buffer{} @@ -95,14 +94,14 @@ func (s *DistributeImageStep) Run(ctx context.Context) error { appendError(errors.New(errMsg)) return } - log.Infof("%s tag image [%s] to [%s] succeed", time.Now().Format(setting.WorkflowTimeFormat), target.SourceImage, target.TargetImage) + log.Infof("tag image [%s] to [%s] succeed", target.SourceImage, target.TargetImage) }(target) } wg.Wait() if err := errList.ErrorOrNil(); err != nil { return fmt.Errorf("prepare source images error: %v", err) } - log.Infof("%s Finish prepare source images.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Finish prepare source images.") if err := s.loginTargetRegistry(); err != nil { return err @@ -120,7 +119,7 @@ func (s *DistributeImageStep) Run(ctx context.Context) error { appendError(errors.New(errMsg)) return } - log.Infof("%s push image [%s] succeed", time.Now().Format(setting.WorkflowTimeFormat), target.TargetImage) + log.Infof("push image [%s] succeed", target.TargetImage) }(target) } wg.Wait() @@ -128,12 +127,12 @@ func (s *DistributeImageStep) Run(ctx context.Context) error { return fmt.Errorf("push target images error: %v", err) } - log.Info("%s Finish distribute images.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Finish distribute images.") return nil } func (s *DistributeImageStep) loginSourceRegistry() error { - log.Info("Logining Docker Source Registry.") + log.Info("Logging in Docker Source Registry.") startTimeDockerLogin := time.Now() loginCmd := dockerLogin(s.spec.SourceRegistry.AccessKey, s.spec.SourceRegistry.SecretKey, s.spec.SourceRegistry.RegAddr) var out bytes.Buffer @@ -147,7 +146,7 @@ func (s *DistributeImageStep) loginSourceRegistry() error { } func (s *DistributeImageStep) loginTargetRegistry() error { - log.Info("%s Logging in Docker Target Registry.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Logging in Docker Target Registry.") startTimeDockerLogin := time.Now() loginCmd := dockerLogin(s.spec.TargetRegistry.AccessKey, s.spec.TargetRegistry.SecretKey, s.spec.TargetRegistry.RegAddr) var out bytes.Buffer @@ -156,7 +155,7 @@ func (s *DistributeImageStep) loginTargetRegistry() error { if err := loginCmd.Run(); err != nil { return fmt.Errorf("failed to login docker registry: %s %s", err, out.String()) } - log.Infof("%s Login ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(startTimeDockerLogin).Seconds()) + log.Infof("Login ended. Duration: %.2f seconds.", time.Since(startTimeDockerLogin).Seconds()) return nil } diff --git a/pkg/microservice/jobexecutor/core/service/step/step_docker_build.go b/pkg/microservice/jobexecutor/core/service/step/step_docker_build.go index 969881c567..c59a47a20f 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_docker_build.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_docker_build.go @@ -56,11 +56,7 @@ func NewDockerBuildStep(spec interface{}, workspace string, envs, secretEnvs []s } func (s *DockerBuildStep) Run(ctx context.Context) error { - start := time.Now() - log.Infof("%s Start docker build.", time.Now().Format(setting.WorkflowTimeFormat)) - defer func() { - log.Infof("%s Docker build ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) - }() + log.Infof("Start docker build.") envMap := makeEnvMap(s.envs, s.secretEnvs) if image, ok := envMap["IMAGE"]; ok { @@ -82,7 +78,7 @@ func (s DockerBuildStep) dockerLogin() error { return nil } if s.spec.DockerRegistry.UserName != "" { - fmt.Printf("Logining Docker Registry: %s.\n", s.spec.DockerRegistry.Host) + log.Infof("Logging in Docker Registry: %s.", s.spec.DockerRegistry.Host) startTimeDockerLogin := time.Now() cmd := dockerLogin(s.spec.DockerRegistry.UserName, s.spec.DockerRegistry.Password, s.spec.DockerRegistry.Host) var out bytes.Buffer @@ -114,7 +110,7 @@ func (s DockerBuildStep) dockerLogin() error { return fmt.Errorf("failed to login docker registry: %s %s", err, out.String()) } - fmt.Printf("%s Login ended. Duration: %.2f seconds.\n", time.Now().Format(setting.WorkflowTimeFormat), time.Since(startTimeDockerLogin).Seconds()) + log.Infof("Login ended. Duration: %.2f seconds.", time.Since(startTimeDockerLogin).Seconds()) } return nil } @@ -124,19 +120,19 @@ func (s *DockerBuildStep) runDockerBuild() error { return nil } - fmt.Printf("%s Preparing Dockerfile.\n", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Preparing Dockerfile.") startTimePrepareDockerfile := time.Now() err := prepareDockerfile(s.spec.Source, s.spec.DockerTemplateContent) if err != nil { return fmt.Errorf("failed to prepare dockerfile: %s", err) } - fmt.Printf("Preparation ended. Duration: %.2f seconds.\n", time.Since(startTimePrepareDockerfile).Seconds()) + log.Infof("Preparation ended. Duration: %.2f seconds.", time.Since(startTimePrepareDockerfile).Seconds()) if s.spec.Proxy != nil { setProxy(s.spec) } - fmt.Printf("%s Running Docker Build.\n", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Running Docker Build.") startTimeDockerBuild := time.Now() envs := s.envs for _, c := range s.dockerCommands() { @@ -171,7 +167,7 @@ func (s *DockerBuildStep) runDockerBuild() error { return fmt.Errorf("failed to run docker build: %s", err) } } - fmt.Printf("%s Docker build ended. Duration: %.2f seconds.\n", time.Now().Format(setting.WorkflowTimeFormat), time.Since(startTimeDockerBuild).Seconds()) + log.Infof("Docker build ended. Duration: %.2f seconds.", time.Since(startTimeDockerBuild).Seconds()) return nil } diff --git a/pkg/microservice/jobexecutor/core/service/step/step_download_archive.go b/pkg/microservice/jobexecutor/core/service/step/step_download_archive.go index 4662226420..b4f99812dd 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_download_archive.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_download_archive.go @@ -57,7 +57,7 @@ func NewDownloadArchiveStep(spec interface{}, workspace string, envs, secretEnvs func (s *DownloadArchiveStep) Run(ctx context.Context) error { start := time.Now() defer func() { - log.Infof("%s Download Archive ended. Duration: %.2f seconds", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) + log.Infof("Download Archive ended. Duration: %.2f seconds", time.Since(start).Seconds()) }() envmaps := makeEnvMap(s.envs, s.secretEnvs) @@ -72,7 +72,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { client, err := s3.NewClient(s.spec.S3.Endpoint, s.spec.S3.Ak, s.spec.S3.Sk, s.spec.S3.Region, s.spec.S3.Insecure, forcedPathStyle) if err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to create s3 client to upload file, err: %s", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("failed to create s3 client to upload file, err: %s", err) return nil } else { return fmt.Errorf("failed to create s3 client to upload file, err: %s", err) @@ -85,7 +85,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { err = client.Download(s.spec.S3.Bucket, objectKey, destPath) if err != nil { if s.spec.IgnoreErr { - log.Errorf("%s download archive err, bucketName: %s, objectKey: %s, err: %v", time.Now().Format(setting.WorkflowTimeFormat), s.spec.S3.Bucket, objectKey, err) + log.Errorf("download archive err, bucketName: %s, objectKey: %s, err: %v", s.spec.S3.Bucket, objectKey, err) return nil } else { return fmt.Errorf("failed to download archive from s3, bucketName: %s, objectKey: %s, destPath: %s, err: %s", s.spec.S3.Bucket, objectKey, destPath, err) @@ -99,7 +99,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { err = client.Download(s.spec.S3.Bucket, objectKey, sourceFilename) if err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to download archive from s3, bucketName: %s, objectKey: %s, err: %v", time.Now().Format(setting.WorkflowTimeFormat), s.spec.S3.Bucket, objectKey, err) + log.Errorf("failed to download archive from s3, bucketName: %s, objectKey: %s, err: %v", s.spec.S3.Bucket, objectKey, err) return nil } else { return fmt.Errorf("failed to download archive from s3, bucketName: %s, objectKey: %s, source: %s, err: %s", s.spec.S3.Bucket, objectKey, sourceFilename, err) @@ -109,7 +109,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { destPath = s.spec.DestDir if err = os.MkdirAll(destPath, os.ModePerm); err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to MkdirAll destPath %s, err: %s", time.Now().Format(setting.WorkflowTimeFormat), destPath, err) + log.Errorf("failed to MkdirAll destPath %s, err: %s", destPath, err) return nil } else { return fmt.Errorf("failed to MkdirAll destPath %s, err: %s", destPath, err) @@ -120,7 +120,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { cmd.Stderr = out if err := cmd.Run(); err != nil { if s.spec.IgnoreErr { - log.Errorf("%s cmd: %s, err: %s %v", time.Now().Format(setting.WorkflowTimeFormat), cmd.String(), out.String(), err) + log.Errorf("cmd: %s, err: %s %v", cmd.String(), out.String(), err) return nil } else { return fmt.Errorf("cmd: %s, err: %s %v", cmd.String(), out.String(), err) @@ -128,7 +128,7 @@ func (s *DownloadArchiveStep) Run(ctx context.Context) error { } } else { if s.spec.IgnoreErr { - log.Errorf("%s failed to GenerateTmpFile, err: %s", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("failed to GenerateTmpFile, err: %s", err) return nil } else { return fmt.Errorf("failed to GenerateTmpFile, err: %s", err) diff --git a/pkg/microservice/jobexecutor/core/service/step/step_git.go b/pkg/microservice/jobexecutor/core/service/step/step_git.go index 0c8c01965b..2ce3b7f58a 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_git.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_git.go @@ -61,9 +61,9 @@ func NewGitStep(spec interface{}, workspace string, envs, secretEnvs []string) ( func (s *GitStep) Run(ctx context.Context) error { start := time.Now() - log.Infof("%s Start git clone.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Start git clone.", time.Now().Format(setting.WorkflowTimeFormat)) defer func() { - log.Infof("$s Git clone ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) + log.Infof("Git clone ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) }() return s.runGitCmds() } @@ -207,11 +207,11 @@ func (s *GitStep) buildGitCommands(repo *types.Repository, hostNames sets.String // 预防非正常退出导致git被锁住 indexLockPath := path.Join(workDir, "/.git/index.lock") if err := os.RemoveAll(indexLockPath); err != nil { - log.Errorf("%s Failed to remove %s: %s", time.Now().Format(setting.WorkflowTimeFormat), indexLockPath, err) + log.Errorf("Failed to remove %s: %s", indexLockPath, err) } shallowLockPath := path.Join(workDir, "/.git/shallow.lock") if err := os.RemoveAll(shallowLockPath); err != nil { - log.Errorf("%s Failed to remove %s: %s", time.Now().Format(setting.WorkflowTimeFormat), shallowLockPath, err) + log.Errorf("Failed to remove %s: %s", shallowLockPath, err) } if isDirEmpty(filepath.Join(workDir, ".git")) { @@ -248,7 +248,7 @@ func (s *GitStep) buildGitCommands(repo *types.Repository, hostNames sets.String host := getHost(repo.Address) if !hostNames.Has(host) { if err := writeSSHFile(repo.SSHKey, host); err != nil { - log.Errorf("%s failed to write ssh file %s: %s", time.Now().Format(setting.WorkflowTimeFormat), repo.SSHKey, err) + log.Errorf("failed to write ssh file %s: %s", repo.SSHKey, err) } hostNames.Insert(host) } @@ -264,7 +264,7 @@ func (s *GitStep) buildGitCommands(repo *types.Repository, hostNames sets.String } else if repo.AuthType == types.PrivateAccessTokenAuthType { u, err := url.Parse(repo.Address) if err != nil { - log.Errorf("%s failed to parse url,err:%s", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("failed to parse url,err:%s", err) } else { host := strings.TrimSuffix(strings.Join([]string{u.Host, u.Path}, "/"), "/") cmds = append(cmds, &c.Command{ diff --git a/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go b/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go index c8bd2ccf25..087c1d5f4e 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_junit_report.go @@ -62,7 +62,7 @@ func NewJunitReportStep(spec interface{}, workspace string, envs, secretEnvs []s } func (s *JunitReportStep) Run(ctx context.Context) error { - log.Info("%s Start merge ginkgo test results.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Start merge ginkgo test results.") if err := os.MkdirAll(s.spec.DestDir, os.ModePerm); err != nil { return fmt.Errorf("create dest dir: %s error: %s", s.spec.DestDir, err) } @@ -75,9 +75,9 @@ func (s *JunitReportStep) Run(ctx context.Context) error { if err != nil { return fmt.Errorf("failed to merge test result: %s", err) } - log.Info("%s Finish merge ginkgo test results.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Finish merge ginkgo test results.") - log.Infof("%s Start archive %s.", time.Now().Format(setting.WorkflowTimeFormat), s.spec.FileName) + log.Infof("Start archive %s.", s.spec.FileName) if s.spec.S3DestDir == "" || s.spec.FileName == "" { return nil } @@ -113,7 +113,7 @@ func (s *JunitReportStep) Run(ctx context.Context) error { return err } } - log.Infof("%s Finish archive %s.", time.Now().Format(setting.WorkflowTimeFormat), s.spec.FileName) + log.Infof("Finish archive %s.", s.spec.FileName) if failedCaseCount > 0 { return fmt.Errorf("%d case(s) failed", failedCaseCount) } @@ -146,12 +146,12 @@ func mergeGinkgoTestResults(testResultFile, testResultPath, testUploadPath strin for _, file := range files { if filepath.Ext(file.Name()) == ".xml" { filePath := path.Join(testResultPath, file.Name()) - log.Infof("%s name %s mod time: %v", time.Now().Format(setting.WorkflowTimeFormat), file.Name(), file.ModTime()) + log.Infof("name %s mod time: %v", file.Name(), file.ModTime()) // 1. read file xmlBytes, err2 := ioutil.ReadFile(filePath) if err2 != nil { - log.Warningf("%s Read file [%s], error: %v", time.Now().Format(setting.WorkflowTimeFormat), filePath, err2) + log.Warningf("Read file [%s], error: %v", filePath, err2) continue } @@ -161,7 +161,7 @@ func mergeGinkgoTestResults(testResultFile, testResultPath, testUploadPath strin var results *meta.TestSuites err2 = xml.Unmarshal(xmlBytes, &results) if err2 != nil { - log.Warningf("%s Unmarshal xml file [%s], error: %v\n", time.Now().Format(setting.WorkflowTimeFormat), filePath, err2) + log.Warningf("Unmarshal xml file [%s], error: %v\n", filePath, err2) continue } for _, testSuite := range results.TestSuites { @@ -181,7 +181,7 @@ func mergeGinkgoTestResults(testResultFile, testResultPath, testUploadPath strin var result *meta.TestSuite err2 = xml.Unmarshal(xmlBytes, &result) if err2 != nil { - log.Warningf("%s Unmarshal xml file [%s], error: %v\n", time.Now().Format(setting.WorkflowTimeFormat), filePath, err2) + log.Warningf("Unmarshal xml file [%s], error: %v\n", filePath, err2) continue } // 4. process summary result attribute @@ -223,7 +223,7 @@ func mergeGinkgoTestResults(testResultFile, testResultPath, testUploadPath strin return failedCaseCount, err } - log.Infof("%s merge test results files %s succeeded", time.Now().Format(setting.WorkflowTimeFormat), testResultFile) + log.Infof("merge test results files %s succeeded", testResultFile) return summaryResult.Failures, nil } diff --git a/pkg/microservice/jobexecutor/core/service/step/step_shell.go b/pkg/microservice/jobexecutor/core/service/step/step_shell.go index 76e9eb9f4a..85c08bdc4c 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_shell.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_shell.go @@ -27,7 +27,6 @@ import ( "sync" "time" - "github.com/koderover/zadig/v2/pkg/setting" "gopkg.in/yaml.v2" "github.com/koderover/zadig/v2/pkg/tool/log" @@ -57,20 +56,20 @@ func NewShellStep(spec interface{}, workspace, paths string, envs, secretEnvs [] func (s *ShellStep) Run(ctx context.Context) error { start := time.Now() - log.Infof("%s Executing user script.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Executing user script.") defer func() { - log.Infof("%s Script Execution ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) + log.Infof("Script Execution ended. Duration: %.2f seconds.", time.Since(start).Seconds()) }() // This is to record that the shell step beginning and finished, for debug err := os.WriteFile("/zadig/debug/shell_step", nil, 0700) if err != nil { - log.Warnf("%s Failed to record shell_step file, error: %v", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Warnf("Failed to record shell_step file, error: %v", err) } defer func() { err := os.WriteFile("/zadig/debug/shell_step_done", nil, 0700) if err != nil { - log.Warnf("%s Failed to record shell_step_done file, error: %v", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Warnf("Failed to record shell_step_done file, error: %v", err) } }() diff --git a/pkg/microservice/jobexecutor/core/service/step/step_sonar_check.go b/pkg/microservice/jobexecutor/core/service/step/step_sonar_check.go index 11ce5e0363..233df1002f 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_sonar_check.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_sonar_check.go @@ -52,7 +52,7 @@ func NewSonarCheckStep(spec interface{}, workspace string, envs, secretEnvs []st } func (s *SonarCheckStep) Run(ctx context.Context) error { - log.Info("%s Start check Sonar scanning quality gate status.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Info("Start check Sonar scanning quality gate status.") client := sonar.NewSonarClient(s.spec.SonarServer, s.spec.SonarToken) sonarWorkDir := sonar.GetSonarWorkDir(s.spec.Parameter) if sonarWorkDir == "" { @@ -64,7 +64,7 @@ func (s *SonarCheckStep) Run(ctx context.Context) error { taskReportDir := filepath.Join(sonarWorkDir, "report-task.txt") bytes, err := ioutil.ReadFile(taskReportDir) if err != nil { - log.Errorf("%s read sonar task report file: %s error :%v", time.Now().Format(setting.WorkflowTimeFormat), taskReportDir, err) + log.Errorf("read sonar task report file: %s error :%v", time.Now().Format(setting.WorkflowTimeFormat), taskReportDir, err) return err } taskReportContent := string(bytes) @@ -83,7 +83,7 @@ func (s *SonarCheckStep) Run(ctx context.Context) error { log.Error(err) return err } - log.Infof("%s Sonar quality gate status: %s", time.Now().Format(setting.WorkflowTimeFormat), gateInfo.ProjectStatus.Status) + log.Infof("Sonar quality gate status: %s", gateInfo.ProjectStatus.Status) sonar.PrintSonarConditionTables(gateInfo.ProjectStatus.Conditions) if gateInfo.ProjectStatus.Status != sonar.QualityGateOK && gateInfo.ProjectStatus.Status != sonar.QualityGateNone { return fmt.Errorf("sonar quality gate status was: %s", gateInfo.ProjectStatus.Status) diff --git a/pkg/microservice/jobexecutor/core/service/step/step_tar_archive.go b/pkg/microservice/jobexecutor/core/service/step/step_tar_archive.go index d48a8043dc..0675705593 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_tar_archive.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_tar_archive.go @@ -58,7 +58,7 @@ func (s *TarArchiveStep) Run(ctx context.Context) error { if len(s.spec.ResultDirs) == 0 { return nil } - log.Infof("%s Start tar archive %s.", time.Now().Format(setting.WorkflowTimeFormat), s.spec.FileName) + log.Infof("Start tar archive %s.", s.spec.FileName) forcedPathStyle := true if s.spec.S3Storage.Provider == setting.ProviderSourceAli { forcedPathStyle = false @@ -66,7 +66,7 @@ func (s *TarArchiveStep) Run(ctx context.Context) error { client, err := s3.NewClient(s.spec.S3Storage.Endpoint, s.spec.S3Storage.Ak, s.spec.S3Storage.Sk, s.spec.S3Storage.Region, s.spec.S3Storage.Insecure, forcedPathStyle) if err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to create s3 client to upload file, err: %s", time.Now().Format(setting.WorkflowTimeFormat), err) + log.Errorf("failed to create s3 client to upload file, err: %s", err) return nil } else { return fmt.Errorf("failed to create s3 client to upload file, err: %s", err) @@ -144,7 +144,7 @@ func (s *TarArchiveStep) Run(ctx context.Context) error { if err = cmd.Run(); err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to compress %s, cmd: %s, err: %s", time.Now().Format(setting.WorkflowTimeFormat), tarName, cmd.String(), err) + log.Errorf("failed to compress %s, cmd: %s, err: %s", tarName, cmd.String(), err) return nil } else { return fmt.Errorf("failed to compress %s, cmd: %s, err: %s", tarName, cmd.String(), err) @@ -154,12 +154,12 @@ func (s *TarArchiveStep) Run(ctx context.Context) error { objectKey := filepath.Join(s.spec.S3DestDir, s.spec.FileName) if err := client.Upload(s.spec.S3Storage.Bucket, tarName, objectKey); err != nil { if s.spec.IgnoreErr { - log.Errorf("%s failed to upload archive to s3, bucketName: %s, src: %s, objectKey: %s, err: %s", time.Now().Format(setting.WorkflowTimeFormat), s.spec.S3Storage.Bucket, tarName, objectKey, err) + log.Errorf("failed to upload archive to s3, bucketName: %s, src: %s, objectKey: %s, err: %s", s.spec.S3Storage.Bucket, tarName, objectKey, err) return nil } else { return fmt.Errorf("failed to upload archive to s3, bucketName: %s, src: %s, objectKey: %s, err: %s", s.spec.S3Storage.Bucket, tarName, objectKey, err) } } - log.Infof("%s Finish archive %s.", time.Now().Format(setting.WorkflowTimeFormat), s.spec.FileName) + log.Infof("Finish archive %s.", s.spec.FileName) return nil } diff --git a/pkg/microservice/jobexecutor/core/service/step/step_tool_install.go b/pkg/microservice/jobexecutor/core/service/step/step_tool_install.go index ef820008d6..a171425426 100644 --- a/pkg/microservice/jobexecutor/core/service/step/step_tool_install.go +++ b/pkg/microservice/jobexecutor/core/service/step/step_tool_install.go @@ -44,9 +44,9 @@ func NewToolInstallStep(spec interface{}, workspace string, envs, secretEnvs []s func (s *ToolInstallStep) Run(ctx context.Context) error { start := time.Now() - log.Infof("%s Installing tools.", time.Now().Format(setting.WorkflowTimeFormat)) + log.Infof("Installing tools.") defer func() { - log.Infof("%s Install tools ended. Duration: %.2f seconds.", time.Now().Format(setting.WorkflowTimeFormat), time.Since(start).Seconds()) + log.Infof("Install tools ended. Duration: %.2f seconds.", time.Since(start).Seconds()) }() for _, tool := range s.spec.Installs { @@ -110,7 +110,7 @@ func (s *ToolInstallStep) runIntallationScripts(tool *step.Tool) error { tmpPath, objectKey, ) - fmt.Printf("%s Package loaded from url: %s\n", time.Now().Format(setting.WorkflowTimeFormat), tool.Download) + log.Infof("Package loaded from url: %s", tool.Download) } } else { err := httpclient.Download(tool.Download, tmpPath)