Merge pull request #12 from liuxp0827/f_newlogger_hook

ACoderHIT · web-flow · commit f457323e4884 · 2020-08-31T10:04:20.000+08:00
支持日志按日志等级分割文件
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.1.20(2020-08-21)
+
+### New Features
+- 日志文件可根据不同日志等级进行切分，不同级别日志记录到对应的日志文件
+
 ## v0.1.19(2020-06-16)
 
 ### New Features
diff --git a/alimns/alimns_test.go b/alimns/alimns_test.go
@@ -1,8 +1,8 @@
 package alimns
 
 import (
-	"testing"
 	"github.com/qit-team/snow-core/config"
+	"testing"
 )
 
 func TestNewMnsClient(t *testing.T) {
diff --git a/alimns/provider.go b/alimns/provider.go
@@ -1,13 +1,13 @@
 package alimns
 
 import (
-	"github.com/qit-team/snow-core/config"
-	"github.com/qit-team/snow-core/kernel/container"
-	"github.com/aliyun/aliyun-mns-go-sdk"
+	"errors"
 	"fmt"
+	"github.com/aliyun/aliyun-mns-go-sdk"
+	"github.com/qit-team/snow-core/config"
 	"github.com/qit-team/snow-core/helper"
+	"github.com/qit-team/snow-core/kernel/container"
 	"sync"
-	"errors"
 )
 
 const (
diff --git a/alimns/provider_test.go b/alimns/provider_test.go
@@ -1,8 +1,8 @@
 package alimns
 
 import (
-	"testing"
 	"github.com/qit-team/snow-core/config"
+	"testing"
 )
 
 func Test_getSingleton(t *testing.T) {
@@ -33,7 +33,7 @@ func TestProvider(t *testing.T) {
 	}
 
 	arr = Pr.Provides()
-	if !(len(arr) == 2 && arr[1] == "mns1"|| arr[1] == "mns") {
+	if !(len(arr) == 2 && arr[1] == "mns1" || arr[1] == "mns") {
 		t.Errorf("Provides is not match. %v", arr)
 		return
 	}
diff --git a/cache/memorycache/memory_cache.go b/cache/memorycache/memory_cache.go
@@ -2,12 +2,12 @@ package memorycache
 
 import (
 	"context"
+	"errors"
+	"fmt"
 	"github.com/qit-team/snow-core/cache"
+	"strconv"
 	"sync"
 	"time"
-	"errors"
-	"strconv"
-	"fmt"
 )
 
 const (
diff --git a/cache/memorycache/memory_cache_test.go b/cache/memorycache/memory_cache_test.go
@@ -2,10 +2,10 @@ package memorycache
 
 import (
 	"context"
+	"errors"
 	"github.com/qit-team/snow-core/cache"
 	"testing"
 	"time"
-	"errors"
 )
 
 var c cache.Cache
@@ -208,7 +208,6 @@ func TestMemoryCache_IncrBy(t *testing.T) {
 	}
 }
 
-
 func TestMemoryCache_DecrBy(t *testing.T) {
 	ctx := context.TODO()
 	key := "test-desc"
@@ -231,7 +230,7 @@ func TestMemoryCache_DecrBy(t *testing.T) {
 		return
 	}
 
-	c.Delete(ctx , key)
+	c.Delete(ctx, key)
 	res, err = c.DecrBy(ctx, key, -30)
 	if err != nil {
 		t.Error(err)
@@ -241,6 +240,3 @@ func TestMemoryCache_DecrBy(t *testing.T) {
 		return
 	}
 }
-
-
-
diff --git a/command/command.go b/command/command.go
@@ -1,8 +1,8 @@
 package command
 
 import (
-	"sync"
 	"errors"
+	"sync"
 )
 
 var (
diff --git a/command/command_test.go b/command/command_test.go
@@ -1,8 +1,8 @@
 package command
 
 import (
-	"testing"
 	"fmt"
+	"testing"
 )
 
 func TestNew(t *testing.T) {
diff --git a/config/config.go b/config/config.go
@@ -57,6 +57,7 @@ type MnsConfig struct {
 type LogConfig struct {
 	Handler  string
 	Level    string
+	Segment  bool
 	Dir      string
 	FileName string
 }
diff --git a/db/db.go b/db/db.go
@@ -7,10 +7,10 @@ import (
 	//_ "github.com/denisenkom/go-mssqldb" //mssql
 	"errors"
 	"fmt"
-	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"time"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 const (
diff --git a/db/db_test.go b/db/db_test.go
@@ -2,9 +2,9 @@ package db
 
 import (
 	"fmt"
-	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"testing"
+	"xorm.io/xorm"
 	//go test时需要开启
 	_ "github.com/go-sql-driver/mysql"
 )
diff --git a/db/provider.go b/db/provider.go
@@ -3,11 +3,11 @@ package db
 import (
 	"errors"
 	"fmt"
-	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"github.com/qit-team/snow-core/helper"
 	"github.com/qit-team/snow-core/kernel/container"
 	"sync"
+	"xorm.io/xorm"
 )
 
 const (
diff --git a/go.mod b/go.mod
@@ -16,7 +16,10 @@ require (
 	github.com/hetiansu5/cores v1.0.0
 	github.com/hetiansu5/go-redis-pool v1.1.4
 	github.com/klauspost/compress v1.10.7 // indirect
+	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible // indirect
+	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/qit-team/work v0.3.9
+	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
 	github.com/robfig/cron v1.2.0
 	github.com/sirupsen/logrus v1.6.0
 	github.com/valyala/fasthttp v1.13.1 // indirect
diff --git a/go.sum b/go.sum
@@ -97,6 +97,11 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
+github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
+github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
+github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
+github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
@@ -116,7 +121,10 @@ github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -129,6 +137,8 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
 github.com/qit-team/work v0.3.9 h1:sQhpdKqG+wihTAhuwhAlcvBakz7JuGClSVUkbz2jCo4=
 github.com/qit-team/work v0.3.9/go.mod h1:h5m1cZjn+BznChuAyMiR/+IUyWEmaMylPKRhq/AlxKw=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=
+github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
diff --git a/http/ctxkit/ctxkit.go b/http/ctxkit/ctxkit.go
@@ -1,13 +1,13 @@
 package ctxkit
 
 import (
-	"github.com/gin-gonic/gin"
 	"context"
-	"github.com/qit-team/snow-core/utils"
 	"crypto/md5"
+	"errors"
 	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/qit-team/snow-core/utils"
 	"strings"
-	"errors"
 )
 
 const (
@@ -72,11 +72,11 @@ func GenerateTraceId(ctx context.Context) (string, error) {
 	mdTemp := md5.Sum([]byte(randomId))
 	mdCode := fmt.Sprintf("%x", mdTemp)
 	mdStr := strings.ToUpper(mdCode)
-    if len(mdStr) < 32 {
-    	return "", errors.New("grenerateTraceIdError")
+	if len(mdStr) < 32 {
+		return "", errors.New("grenerateTraceIdError")
 	}
-	traceId := mdStr[0 : 8] + "-" + mdStr[8 : 12] + "-" + mdStr[12 : 16] + "-" + mdStr[16 : 20] + "-" + mdStr[20 : 32]
+	traceId := mdStr[0:8] + "-" + mdStr[8:12] + "-" + mdStr[12:16] + "-" + mdStr[16:20] + "-" + mdStr[20:32]
 
 	SetTraceId(ctx, traceId)
 	return traceId, nil
-}
+}
diff --git a/http/ctxkit/ctxkit_test.go b/http/ctxkit/ctxkit_test.go
@@ -1,9 +1,9 @@
 package ctxkit
 
 import (
-	"testing"
-	"github.com/gin-gonic/gin"
 	"fmt"
+	"github.com/gin-gonic/gin"
+	"testing"
 )
 
 var c *gin.Context
diff --git a/http/middleware/access_log.go b/http/middleware/access_log.go
@@ -1,9 +1,9 @@
 package middleware
 
 import (
-	"github.com/qit-team/snow-core/log/accesslogger"
 	"github.com/gin-gonic/gin"
 	"github.com/hetiansu5/accesslog"
+	"github.com/qit-team/snow-core/log/accesslogger"
 	"time"
 )
 
diff --git a/http/middleware/ctxkit.go b/http/middleware/ctxkit.go
@@ -16,7 +16,7 @@ func GenContextKit(c *gin.Context) {
 	} else {
 		_, err := ctxkit.GenerateTraceId(c)
 		if err != nil {
-			logger.Error(c,"===GenContextKit.setTraceIdError===", err)
+			logger.Error(c, "===GenContextKit.setTraceIdError===", err)
 		}
 	}
 }
diff --git a/kernel/close/close.go b/kernel/close/close.go
@@ -8,7 +8,7 @@ var (
 )
 
 type Closeable interface {
-	Close() (error)
+	Close() error
 }
 
 //注册应用停止时需要释放链接的服务
diff --git a/kernel/container/container.go b/kernel/container/container.go
@@ -1,11 +1,11 @@
 package container
 
 import (
-	"sync"
-	"reflect"
+	"errors"
 	"fmt"
+	"reflect"
 	"strings"
-	"errors"
+	"sync"
 )
 
 var (
diff --git a/kernel/provider/provider.go b/kernel/provider/provider.go
@@ -1,7 +1,7 @@
 package provider
 
 type Provider interface {
-	Register(args ... interface{}) (error)
-	Provides() ([]string)
-	Close() (error)
+	Register(args ...interface{}) error
+	Provides() []string
+	Close() error
 }
diff --git a/kernel/server/console.go b/kernel/server/console.go
@@ -1,8 +1,8 @@
 package server
 
 import (
-	"github.com/robfig/cron"
 	"fmt"
+	"github.com/robfig/cron"
 	"time"
 )
 
diff --git a/kernel/server/http.go b/kernel/server/http.go
@@ -1,11 +1,11 @@
 package server
 
 import (
-	"github.com/gin-gonic/gin"
 	"fmt"
+	"github.com/fvbock/endless"
+	"github.com/gin-gonic/gin"
 	"github.com/qit-team/snow-core/config"
 	"strconv"
-	"github.com/fvbock/endless"
 	"syscall"
 )
 
diff --git a/log/accesslogger/access_logger.go b/log/accesslogger/access_logger.go
@@ -1,9 +1,9 @@
 package accesslogger
 
 import (
-	"github.com/qit-team/snow-core/log/logger"
 	"github.com/hetiansu5/accesslog"
 	coresio "github.com/hetiansu5/cores/io"
+	"github.com/qit-team/snow-core/log/logger"
 	"io"
 )
 
diff --git a/log/accesslogger/provider.go b/log/accesslogger/provider.go
@@ -1,13 +1,13 @@
 package accesslogger
 
 import (
+	"errors"
+	"fmt"
+	"github.com/hetiansu5/accesslog"
 	"github.com/qit-team/snow-core/config"
+	"github.com/qit-team/snow-core/helper"
 	"github.com/qit-team/snow-core/kernel/container"
-	"github.com/hetiansu5/accesslog"
 	"sync"
-	"errors"
-	"github.com/qit-team/snow-core/helper"
-	"fmt"
 )
 
 const SingletonMain = "access_logger"
diff --git a/log/accesslogger/provider_test.go b/log/accesslogger/provider_test.go
@@ -1,8 +1,8 @@
 package accesslogger
 
 import (
-	"testing"
 	"github.com/qit-team/snow-core/config"
+	"testing"
 )
 
 func Test_getSingleton(t *testing.T) {
diff --git a/log/logger/logger.go b/log/logger/logger.go
diff --git a/log/logger/provider.go b/log/logger/provider.go
diff --git a/log/logger/segment.go b/log/logger/segment.go
diff --git a/queue/queue_test.go b/queue/queue_test.go
diff --git a/redis/provider.go b/redis/provider.go
diff --git a/redis/provider_test.go b/redis/provider_test.go
diff --git a/redis/redis_test.go b/redis/redis_test.go
diff --git a/utils/httputil/http.go b/utils/httputil/http.go
diff --git a/utils/iputil/ip.go b/utils/iputil/ip.go
diff --git a/utils/url.go b/utils/url.go
diff --git a/utils/url_test.go b/utils/url_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package alimns`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "testing"`
`5`	`4`	`"github.com/qit-team/snow-core/config"`
	`5`	`+ "testing"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`func TestNewMnsClient(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ package memorycache`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "errors"`
`5`	`6`	`"github.com/qit-team/snow-core/cache"`
`6`	`7`	`"testing"`
`7`	`8`	`"time"`
`8`		`- "errors"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`var c cache.Cache`
`@@ -208,7 +208,6 @@ func TestMemoryCache_IncrBy(t *testing.T) {`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`-`
`212`	`211`	`func TestMemoryCache_DecrBy(t *testing.T) {`
`213`	`212`	`ctx := context.TODO()`
`214`	`213`	`key := "test-desc"`
`@@ -231,7 +230,7 @@ func TestMemoryCache_DecrBy(t *testing.T) {`
`231`	`230`	`return`
`232`	`231`	`}`
`233`	`232`
`234`		`- c.Delete(ctx , key)`
	`233`	`+ c.Delete(ctx, key)`
`235`	`234`	`res, err = c.DecrBy(ctx, key, -30)`
`236`	`235`	`if err != nil {`
`237`	`236`	`t.Error(err)`
`@@ -241,6 +240,3 @@ func TestMemoryCache_DecrBy(t *testing.T) {`
`241`	`240`	`return`
`242`	`241`	`}`
`243`	`242`	`}`
`244`		`-`
`245`		`-`
`246`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package command`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "sync"`
`5`	`4`	`"errors"`
	`5`	`+ "sync"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ type MnsConfig struct {`
`57`	`57`	`type LogConfig struct {`
`58`	`58`	`Handler string`
`59`	`59`	`Level string`
	`60`	`+ Segment bool`
`60`	`61`	`Dir string`
`61`	`62`	`FileName string`
`62`	`63`	`}`