From 5bb0e465c209764293c74dc2529f15e3c0a80474 Mon Sep 17 00:00:00 2001 From: Zhiwei Liu Date: Sat, 11 May 2019 11:27:17 +0800 Subject: [PATCH 1/2] add pid to log --- log/logger.go | 4 +++- log/logger_test.go | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/log/logger.go b/log/logger.go index e4bcd954bc..9a253b424d 100644 --- a/log/logger.go +++ b/log/logger.go @@ -57,6 +57,8 @@ type Logger struct { mutex *sync.Mutex } +var pid = os.Getpid() + // NewLogger creates a new Logger. func NewLogger(name string, level int, target int) *Logger { var logger Logger @@ -190,7 +192,7 @@ func (logger *Logger) logf(format string, args ...interface{}) { if logger.callCount%rotationCheckFrq == 0 { logger.rotate() } - + format = fmt.Sprintf("[%v] %s", pid, format) logger.callCount++ logger.l.Printf(format, args...) } diff --git a/log/logger_test.go b/log/logger_test.go index 10128ca91a..5a8e25cad7 100644 --- a/log/logger_test.go +++ b/log/logger_test.go @@ -4,7 +4,10 @@ package log import ( + "fmt" + "io/ioutil" "os" + "strings" "testing" ) @@ -48,3 +51,26 @@ func TestLogFileRotatesWhenSizeLimitIsReached(t *testing.T) { } os.Remove(fn) } + +func TestPid(t *testing.T) { + l := NewLogger(logName, LevelInfo, TargetLogfile) + if l == nil { + t.Fatalf("Failed to create logger.") + } + + l.Printf("LogText %v", 1) + l.Close() + fn := l.GetLogDirectory() + logName + ".log" + defer os.Remove(fn) + + logBytes, err := ioutil.ReadFile(fn) + if err != nil { + t.Fatalf("Failed to read log, %v", err) + } + log := string(logBytes) + exptectedLog := fmt.Sprintf("[%v] LogText 1", os.Getpid()); + + if !strings.Contains(log, exptectedLog){ + t.Fatalf("Unexpected log: %s.", log) + } +} From 18596310698848857437c6a48f4d90995330bef5 Mon Sep 17 00:00:00 2001 From: Zhiwei Liu Date: Tue, 14 May 2019 13:13:15 +0800 Subject: [PATCH 2/2] fix code format --- log/logger_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/log/logger_test.go b/log/logger_test.go index 5a8e25cad7..be753c3ecf 100644 --- a/log/logger_test.go +++ b/log/logger_test.go @@ -64,10 +64,10 @@ func TestPid(t *testing.T) { defer os.Remove(fn) logBytes, err := ioutil.ReadFile(fn) - if err != nil { - t.Fatalf("Failed to read log, %v", err) - } - log := string(logBytes) + if err != nil { + t.Fatalf("Failed to read log, %v", err) + } + log := string(logBytes) exptectedLog := fmt.Sprintf("[%v] LogText 1", os.Getpid()); if !strings.Contains(log, exptectedLog){