From 1668a7940c2e40c529b4c75677702564132c853d Mon Sep 17 00:00:00 2001 From: Evan Chen Date: Thu, 4 Nov 2021 03:08:05 +0800 Subject: [PATCH] build: use klog instead --- go.mod | 2 +- go.sum | 6 ++++-- kserver.go | 18 +++++++++--------- server.go | 4 ++-- test/main.go | 8 ++++---- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 21c0c0d..173aaa4 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module kumoly.io/lib/ksrv go 1.17 -require kumoly.io/core/log v0.1.7 +require kumoly.io/lib/klog v0.1.9 require ( github.com/mattn/go-isatty v0.0.14 // indirect diff --git a/go.sum b/go.sum index d7d0b56..4ee5c46 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,7 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -kumoly.io/core/log v0.1.7 h1:eAOitZUYyeivFlqcdNsITZT79vVXCzRckuZozqNwx44= -kumoly.io/core/log v0.1.7/go.mod h1:DrKjL3xGEEJ7OC+NHuuv0JSMV7ZqDSw2GiSFFWxilT4= +kumoly.io/lib/klog v0.1.8 h1:CguIVyo2T/E2cdrc30mFh/KPhIiM/K2hNV8aR8KuSdw= +kumoly.io/lib/klog v0.1.8/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M= +kumoly.io/lib/klog v0.1.9 h1:rS9PPqfyBIIfeQlPSuMv+7StGPiFVuAdp04HDwwDY3E= +kumoly.io/lib/klog v0.1.9/go.mod h1:Snm+c1xRrh/RbXsxQf7UGYbAJGPcIa6bEEN+CmzJh7M= diff --git a/kserver.go b/kserver.go index 19332f4..e73b229 100644 --- a/kserver.go +++ b/kserver.go @@ -3,7 +3,7 @@ package ksrv import ( "net/http" - "kumoly.io/core/log" + "kumoly.io/lib/klog" ) const ( @@ -14,22 +14,22 @@ const ( `{{if .Stack}}{{.Stack|redl}}{{end}}` ) -func (k *kserver) SetLogger(l *log.Logger) { +func (k *kserver) SetLogger(l *klog.Logger) { k.l = l } -func (k *kserver) GetLogger() *log.Logger { +func (k *kserver) GetLogger() *klog.Logger { return k.l } // New returns a extended http.Server func New() *kserver { - l := log.Sub("KSRV") - tmpl := log.NewLogFormater() + l := klog.Sub("KSRV") + tmpl := klog.NewLogFormater() tmpl.InfoTmplStr = DEFAULT_INFO tmpl.ErrTmplStr = DEFAULT_ERR - fMap := log.DefaultFuncMap() + fMap := klog.DefaultFuncMap() fMap["statcol"] = func(code int, s string) string { switch { case code >= http.StatusOK && code < http.StatusMultipleChoices: @@ -92,10 +92,10 @@ func (k *kserver) catch(rw *responseWriter, r *http.Request) { ex := recover() if ex != nil { Abort(rw, ex) - k.l.ErrorF(log.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}, ex) + k.l.ErrorF(klog.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}, ex) } else if rw.StatueCode >= 500 { - k.l.ErrorF(log.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}, rw.err) + k.l.ErrorF(klog.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}, rw.err) } else if k.nolog == nil || !k.nolog(r) { - k.l.InfoF(log.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}) + k.l.InfoF(klog.H{"Status": rw.StatueCode, "IP": GetIP(r), "Method": r.Method, "URL": r.URL.Path, "Agent": r.Header.Get("User-Agent")}) } } diff --git a/server.go b/server.go index 4f71f87..453aa59 100644 --- a/server.go +++ b/server.go @@ -3,12 +3,12 @@ package ksrv import ( "net/http" - "kumoly.io/core/log" + "kumoly.io/lib/klog" ) type kserver struct { http.Server - l *log.Logger + l *klog.Logger nolog func(r *http.Request) bool } diff --git a/test/main.go b/test/main.go index 94bfae7..1519d70 100644 --- a/test/main.go +++ b/test/main.go @@ -5,20 +5,20 @@ import ( "fmt" "net/http" - "kumoly.io/core/log" + "kumoly.io/lib/klog" "kumoly.io/lib/ksrv" ) func main() { - log.PROD = false + klog.PROD = false mux := http.NewServeMux() mux.HandleFunc("/", func(rw http.ResponseWriter, r *http.Request) { rw.Write([]byte("ok")) }) mux.HandleFunc("/err", func(rw http.ResponseWriter, r *http.Request) { ksrv.Abort(rw, errors.New("small err")) }) mux.HandleFunc("/panic", func(rw http.ResponseWriter, r *http.Request) { panic(500) }) mux.HandleFunc("/out", func(rw http.ResponseWriter, r *http.Request) { arr := []int{0, 1}; fmt.Print(arr[9]) }) - log.Info("start") + klog.Info("start") - err := ksrv.New().Handle(mux).Listen("0.0.0.0:8080").Serve() + err := ksrv.New().Handle(mux).Listen("0.0.0.0:8081").Serve() if err != nil { panic(err) }