Fix test

pingcap · Feb 25, 2021 · 7ed712a · 7ed712a
1 parent ddaa0d3
commit 7ed712a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/pkg/cluster/audit/audit.go b/pkg/cluster/audit/audit.go
@@ -45,11 +45,11 @@ func CommandArgs(fp string) ([]string, error) {
 	}
 
 	args := strings.Split(scanner.Text(), " ")
-	return DecodeCommandArgs(args)
+	return decodeCommandArgs(args)
 }
 
-// EncodeCommandArgs encode args with url.QueryEscape
-func EncodeCommandArgs(args []string) []string {
+// encodeCommandArgs encode args with url.QueryEscape
+func encodeCommandArgs(args []string) []string {
 	encoded := []string{}
 
 	for _, arg := range args {
@@ -59,8 +59,8 @@ func EncodeCommandArgs(args []string) []string {
 	return encoded
 }
 
-// DecodeCommandArgs decode args with url.QueryUnescape
-func DecodeCommandArgs(args []string) ([]string, error) {
+// decodeCommandArgs decode args with url.QueryUnescape
+func decodeCommandArgs(args []string) ([]string, error) {
 	decoded := []string{}
 
 	for _, arg := range args {
@@ -113,7 +113,20 @@ func ShowAuditList(dir string) error {
 // OutputAuditLog outputs audit log.
 func OutputAuditLog(dir string, data []byte) error {
 	fname := filepath.Join(dir, base52.Encode(time.Now().UnixNano()+rand.Int63n(1000)))
-	return os.WriteFile(fname, data, 0644)
+	f, err := os.Create(fname)
+	if err != nil {
+		return errors.Annotate(err, "create audit log")
+	}
+	defer f.Close()
+
+	args := encodeCommandArgs(os.Args)
+	if _, err := f.Write([]byte(strings.Join(args, " ") + "\n")); err != nil {
+		return errors.Annotate(err, "write audit log")
+	}
+	if _, err := f.Write(data); err != nil {
+		return errors.Annotate(err, "write audit log")
+	}
+	return nil
 }
 
 // ShowAuditLog show the audit with the specified auditID

diff --git a/pkg/logger/audit.go b/pkg/logger/audit.go
@@ -15,8 +15,6 @@ package logger
 
 import (
 	"bytes"
-	"os"
-	"strings"
 
 	"github.com/pingcap/tiup/pkg/cluster/audit"
 	utils2 "github.com/pingcap/tiup/pkg/utils"
@@ -41,8 +39,7 @@ func DisableAuditLog() {
 }
 
 func newAuditLogCore() zapcore.Core {
-	args := audit.EncodeCommandArgs(os.Args)
-	auditBuffer = bytes.NewBufferString(strings.Join(args, " ") + "\n")
+	auditBuffer = bytes.NewBuffer([]byte{})
 	encoder := zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig())
 	return zapcore.NewCore(encoder, zapcore.Lock(zapcore.AddSync(auditBuffer)), zapcore.DebugLevel)
 }