From 52501e0d012ecac49d55107b8ccddfaa148cda55 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanchen@kumoly.io>
Date: Fri, 5 Nov 2021 23:31:55 +0800
Subject: [PATCH] refact: use the new klog

---
 go.mod       |  2 +-
 go.sum       |  4 ++++
 kserver.go   | 17 +++--------------
 test/main.go |  4 ++--
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/go.mod b/go.mod
index bdc9e2a..bb8f114 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module kumoly.io/lib/ksrv
 
 go 1.17
 
-require kumoly.io/lib/klog v0.0.3-0.20211105083111-32b758725e46
+require kumoly.io/lib/klog v0.0.4
 
 require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
diff --git a/go.sum b/go.sum
index 7962c32..20103f5 100644
--- a/go.sum
+++ b/go.sum
@@ -8,3 +8,7 @@ kumoly.io/lib/klog v0.0.2 h1:6U0k5efspuu0eomvKZ+78WyFqak2WXohjDrg/6R3C3Y=
 kumoly.io/lib/klog v0.0.2/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M=
 kumoly.io/lib/klog v0.0.3-0.20211105083111-32b758725e46 h1:00CMUgz64o+YVJqGbAp+ZP+m1oLuvC0nTMNO0jiaKes=
 kumoly.io/lib/klog v0.0.3-0.20211105083111-32b758725e46/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M=
+kumoly.io/lib/klog v0.0.3 h1:DpJ6i9Y5I4DCEBb7j5oaAPc9tUTB9rDHE2J4bqmsYJY=
+kumoly.io/lib/klog v0.0.3/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M=
+kumoly.io/lib/klog v0.0.4 h1:Ev9G/zvLt/C8Q1yWfYoUcXVJWgPMjpqHPat2WKyOPIM=
+kumoly.io/lib/klog v0.0.4/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M=
diff --git a/kserver.go b/kserver.go
index 0776697..47254c2 100644
--- a/kserver.go
+++ b/kserver.go
@@ -6,13 +6,6 @@ import (
 	"net/http"
 
 	"kumoly.io/lib/klog"
-	"kumoly.io/lib/klog/color"
-)
-
-const (
-	DEFAULT_ERR = `[{{"KSRV"|cyan}}] {{Time}} {{with .Fields}}|{{printf " %3d " .Status|statcol .Status}}| ` +
-		`{{printf "%15s" .IP}} {{printf " %-7s " .Method|methcol .Method}} {{.URL}}{{end}} {{.Message|red}}{{"\n"}}` +
-		`{{if .Stack}}{{.Stack|redl}}{{end}}`
 )
 
 func (k *kserver) SetLogger(l *klog.Logger) {
@@ -27,18 +20,14 @@ func (k *kserver) GetLogger() *klog.Logger {
 func New() *kserver {
 	l := klog.Sub("KSRV")
 	l.SetPrinter(func(w io.Writer, d *klog.Ldata, l2 *klog.Logger) {
-		msg := ""
-		if d.Fields["Message"] != nil {
-			msg = l.M(d.Fields["Message"], color.FgHiRed)
-		}
 		fmt.Fprintf(w, "[%s] %s |%s| %15s %s %s %s\n%s",
-			l.M("KSRV ", color.FgHiCyan),
+			l.M("KSRV ", klog.FgHiCyan),
 			d.Time.Format("2006/01/02 15:04:05"),
 			StatusColor(d.Fields["Status"].(int), l),
 			d.Fields["IP"],
 			MethodColor(d.Fields["Method"], l),
-			d.Fields["URL"], msg,
-			l.M(d.Stack, color.FgRed),
+			d.Fields["URL"], l.M(d.Message, klog.FgRed),
+			l.M(d.Stack, klog.FgRed),
 		)
 	})
 
diff --git a/test/main.go b/test/main.go
index 04757d3..7c6a21e 100644
--- a/test/main.go
+++ b/test/main.go
@@ -19,8 +19,8 @@ func main() {
 	klog.Info("start")
 
 	err := ksrv.New().SetNoLogCondition(func(r *http.Request) bool {
-		return true
-	}).Handle(mux).Listen("127.0.0.1:8080").Serve()
+		return r.URL.String() == "/"
+	}).Handle(mux).Listen("0.0.0.0:8080").Serve()
 	if err != nil {
 		panic(err)
 	}