Explorar o código

Log timestamp

V2Ray %!s(int64=10) %!d(string=hai) anos
pai
achega
cc61e88eca
Modificáronse 2 ficheiros con 6 adicións e 7 borrados
  1. 4 6
      common/log/log.go
  2. 2 1
      common/log/log_test.go

+ 4 - 6
common/log/log.go

@@ -2,10 +2,8 @@ package log
 
 import (
 	"fmt"
-	"io"
+	"log"
 	"os"
-
-	"github.com/v2ray/v2ray-core/common/platform"
 )
 
 const (
@@ -27,7 +25,7 @@ func (this *noOpLogger) WriteLog(prefix, format string, v ...interface{}) {
 }
 
 type streamLogger struct {
-	writer io.Writer
+	logger *log.Logger
 }
 
 func (this *streamLogger) WriteLog(prefix, format string, v ...interface{}) {
@@ -37,13 +35,13 @@ func (this *streamLogger) WriteLog(prefix, format string, v ...interface{}) {
 	} else {
 		data = fmt.Sprintf(format, v...)
 	}
-	this.writer.Write([]byte(prefix + data + platform.LineSeparator()))
+	this.logger.Println(prefix + data)
 }
 
 var (
 	noOpLoggerInstance   logger = &noOpLogger{}
 	streamLoggerInstance logger = &streamLogger{
-		writer: os.Stdout,
+		logger: log.New(os.Stdout, "", log.Ldate|log.Ltime),
 	}
 
 	debugLogger   = noOpLoggerInstance

+ 2 - 1
common/log/log_test.go

@@ -2,6 +2,7 @@ package log
 
 import (
 	"bytes"
+	"log"
 	"testing"
 
 	"github.com/v2ray/v2ray-core/testing/unit"
@@ -24,7 +25,7 @@ func TestStreamLogger(t *testing.T) {
 
 	buffer := bytes.NewBuffer(make([]byte, 0, 1024))
 	logger := &streamLogger{
-		writer: buffer,
+		logger: log.New(buffer, "", 0),
 	}
 	logger.WriteLog("TestPrefix: ", "Test %s Format", "Stream Logger")
 	assert.Bytes(buffer.Bytes()).Equals([]byte("TestPrefix: Test Stream Logger Format\n"))