trim \n

pingcap · Mar 31, 2020 · 65c0b3d · 65c0b3d
1 parent 1ad8548
commit 65c0b3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/backup-manager/app/backup/backup.go b/cmd/backup-manager/app/backup/backup.go
@@ -72,7 +72,7 @@ func (bo *Options) backupData(backup *v1alpha1.Backup) (string, error) {
 	}
 	err = cmd.Start()
 	if err != nil {
-		return remotePath, fmt.Errorf("cluster %s, execute br command failed, output: %s, err: %v", bo, fullArgs, err)
+		return remotePath, fmt.Errorf("cluster %s, execute br command failed, args: %s, err: %v", bo, fullArgs, err)
 	}
 	var tmpOutput, errMsg string
 	for {
@@ -82,7 +82,7 @@ func (bo *Options) backupData(backup *v1alpha1.Backup) (string, error) {
 		if strings.Contains(tmpOutput, "[ERROR]") {
 			errMsg += tmpOutput
 		}
-		klog.Infof(tmpOutput)
+		klog.Infof(strings.Replace(tmpOutput, "\n", "", -1))
 		if err != nil {
 			break
 		}

diff --git a/cmd/backup-manager/app/restore/restore.go b/cmd/backup-manager/app/restore/restore.go
@@ -66,7 +66,7 @@ func (ro *Options) restoreData(restore *v1alpha1.Restore) error {
 	}
 	err = cmd.Start()
 	if err != nil {
-		return fmt.Errorf("cluster %s, execute br command failed, output: %s, err: %v", ro, fullArgs, err)
+		return fmt.Errorf("cluster %s, execute br command failed, args: %s, err: %v", ro, fullArgs, err)
 	}
 	var tmpOutput, errMsg string
 	for {
@@ -76,7 +76,7 @@ func (ro *Options) restoreData(restore *v1alpha1.Restore) error {
 		if strings.Contains(tmpOutput, "[ERROR]") {
 			errMsg += tmpOutput
 		}
-		klog.Infof(tmpOutput)
+		klog.Infof(strings.Replace(tmpOutput, "\n", "", -1))
 		if err != nil {
 			break
 		}