Merge pull request #1239 from rudyfly/log-format

bugfix: modify log format
AliyunContainerService · Apr 27, 2018 · 9afc12e · 9afc12e
2 parents 7bef230 + aa90cda
commit 9afc12e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/daemon/mgr/network.go b/daemon/mgr/network.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"path"
 	"strings"
+	"time"
 
 	apitypes "github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/daemon/config"
@@ -486,9 +487,8 @@ func initNetworkLog(cfg *config.Config) {
 	}
 
 	formatter := &netlog.TextFormatter{
-		ForceColors:     true,
 		FullTimestamp:   true,
-		TimestampFormat: "2006-01-02 15:04:05.000000000",
+		TimestampFormat: time.RFC3339Nano,
 	}
 	netlog.SetFormatter(formatter)
 }

diff --git a/main.go b/main.go
@@ -8,6 +8,7 @@ import (
 	"path"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/alibaba/pouch/daemon"
 	"github.com/alibaba/pouch/daemon/config"
@@ -239,7 +240,7 @@ func initLog() {
 
 	formatter := &logrus.TextFormatter{
 		FullTimestamp:   true,
-		TimestampFormat: "2006-01-02 15:04:05.000000000",
+		TimestampFormat: time.RFC3339Nano,
 	}
 	logrus.SetFormatter(formatter)
 }