Fix pg model generation without tag (#1407)

1. fix pg model struct haven't tag
2. add pg command test from datasource

.github/FUNDING.yml

@@ -9,5 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: # https://gitee.com/kevwan/static/raw/master/images/sponsor.jpg
-ethereum: 0x5052b7f6B937B02563996D23feb69b38D06Ca150 | kevwan
+custom: https://gitee.com/kevwan/static/raw/master/images/sponsor.jpg

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "gomod" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.github/workflows/go.yml

@@ -7,50 +7,32 @@ on:
     branches: [ master ]
 
 jobs:
-  test-linux:
-    name: Linux
+  build:
+    name: Build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.15
-        id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.14
+      id: go
 
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
 
-      - name: Lint
-        run: |
-          go vet -stdmethods=false $(go list ./...)
-          go install mvdan.cc/gofumpt@latest
-          test -z "$(gofumpt -l -extra .)" || echo "Please run 'gofumpt -l -w -extra .'"
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
 
-      - name: Test
-        run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
+    - name: Lint
+      run: |
+        go vet -stdmethods=false $(go list ./...)
+        go install mvdan.cc/gofumpt@latest
+        test -z "$(gofumpt -s -l -extra .)" || echo "Please run 'gofumpt -l -w -extra .'"
 
-      - name: Codecov
-        uses: codecov/codecov-action@v2
+    - name: Test
+      run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
 
-  test-win:
-    name: Windows
-    runs-on: windows-latest
-    steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.15
-
-      - name: Checkout codebase
-        uses: actions/checkout@v3
-
-      - name: Test
-        run: |
-          go mod verify
-          go mod download
-          go test -v -race ./...
-          cd tools/goctl && go build -v goctl.go
+    - name: Codecov
+      uses: codecov/codecov-action@v2

.github/workflows/issue-translator.yml

@@ -1,18 +0,0 @@
-name: 'issue-translator'
-on: 
-  issue_comment: 
-    types: [created]
-  issues: 
-    types: [opened]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: tomsun28/issues-translate-action@v2.6
-        with:
-          IS_MODIFY_TITLE: true
-          # not require, default false, . Decide whether to modify the issue title
-          # if true, the robot account @Issues-translate-bot must have modification permissions, invite @Issues-translate-bot to your project or use your custom bot.
-          CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿
-          # not require. Customize the translation robot prefix message.

.github/workflows/release.yaml

@@ -1,28 +0,0 @@
-on:
-  push:
-    tags:
-      - "tools/goctl/*"
-jobs:
-  releases-matrix:
-    name: Release goctl binary
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        # build and publish in parallel: linux/386, linux/amd64, linux/arm64,
-        # windows/386, windows/amd64, windows/arm64, darwin/amd64, darwin/arm64
-        goos: [ linux, windows, darwin ]
-        goarch: [ "386", amd64, arm64 ]
-        exclude:
-          - goarch: "386"
-            goos: darwin
-    steps:
-      - uses: actions/checkout@v3
-      - uses: zeromicro/go-zero-release-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          goos: ${{ matrix.goos }}
-          goarch: ${{ matrix.goarch }}
-          goversion: "https://dl.google.com/go/go1.17.5.linux-amd64.tar.gz"
-          project_path: "tools/goctl"
-          binary_name: "goctl"
-          extra_files: tools/goctl/goctl.md

.github/workflows/reviewdog.yml

@@ -5,7 +5,7 @@ jobs:
     name: runner / staticcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: reviewdog/action-staticcheck@v1
         with:
           github_token: ${{ secrets.github_token }}

.gitignore

@@ -16,9 +16,7 @@
 **/logs
 
 # for test purpose
-**/adhoc
-go.work
-go.work.sum
+adhoc
 
 # gitlab ci
 .cache

CONTRIBUTING.md

@@ -40,7 +40,7 @@ We will help you to contribute in different areas like filing issues, developing
 getting your work reviewed and merged.
 
 If you have questions about the development process,
-feel free to [file an issue](https://github.com/zeromicro/go-zero/issues/new/choose).
+feel free to [file an issue](https://github.com/tal-tech/go-zero/issues/new/choose).
 
 ## Find something to work on
 
@@ -50,10 +50,10 @@ Here is how you get started.
 
 ### Find a good first topic
 
-[go-zero](https://github.com/zeromicro/go-zero) has beginner-friendly issues that provide a good first issue.
-For example, [go-zero](https://github.com/zeromicro/go-zero) has
-[help wanted](https://github.com/zeromicro/go-zero/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) and
-[good first issue](https://github.com/zeromicro/go-zero/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
+[go-zero](https://github.com/tal-tech/go-zero) has beginner-friendly issues that provide a good first issue.
+For example, [go-zero](https://github.com/tal-tech/go-zero) has
+[help wanted](https://github.com/tal-tech/go-zero/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) and
+[good first issue](https://github.com/tal-tech/go-zero/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
 labels for issues that should not need deep knowledge of the system.
 We can help new contributors who wish to work on such issues.
 
@@ -79,7 +79,7 @@ This is a rough outline of what a contributor's workflow looks like:
 - Create a topic branch from where to base the contribution. This is usually master.
 - Make commits of logical units.
 - Push changes in a topic branch to a personal fork of the repository.
-- Submit a pull request to [go-zero](https://github.com/zeromicro/go-zero).
+- Submit a pull request to [go-zero](https://github.com/tal-tech/go-zero).
 
 ## Creating Pull Requests
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 zeromicro
+Copyright (c) 2020 xiaoheiban_server_go
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

ROADMAP.md

@@ -20,9 +20,9 @@ We hope that the items listed below will inspire further engagement from the com
 - [x] Support `goctl bug` to report bugs conveniently
 
 ## 2022
-- [x] Support `context` in redis related methods for timeout and tracing
-- [x] Support `context` in sql related methods for timeout and tracing
-- [x] Support `context` in mongodb related methods for timeout and tracing
-- [x] Add `httpc.Do` with HTTP call governance, like circuit breaker etc.
-- [ ] Support `goctl doctor` command to report potential issues for given service
 - [ ] Support `goctl mock` command to start a mocking server with given `.api` file
+- [ ] Add `httpx.Client` with governance, like circuit breaker etc.
+- [ ] Support `goctl doctor` command to report potential issues for given service
+- [ ] Support `context` in redis related methods for timeout and tracing
+- [ ] Support `context` in sql related methods for timeout and tracing
+- [ ] Support `context` in mongodb related methods for timeout and tracing

core/bloom/bloom.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/zeromicro/go-zero/core/hash"
-	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/tal-tech/go-zero/core/hash"
+	"github.com/tal-tech/go-zero/core/stores/redis"
 )
 
 const (
@@ -69,8 +69,11 @@ func (f *Filter) Exists(data []byte) (bool, error) {
 	if err != nil {
 		return false, err
 	}
+	if !isSet {
+		return false, nil
+	}
 
-	return isSet, nil
+	return true, nil
 }
 
 func (f *Filter) getLocations(data []byte) []uint {

core/bloom/bloom_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stores/redis/redistest"
+	"github.com/tal-tech/go-zero/core/stores/redis/redistest"
 )
 
 func TestRedisBitSet_New_Set_Test(t *testing.T) {

core/breaker/breaker.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"strings"
 	"sync"
-	"time"
 
-	"github.com/zeromicro/go-zero/core/mathx"
-	"github.com/zeromicro/go-zero/core/proc"
-	"github.com/zeromicro/go-zero/core/stat"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/proc"
+	"github.com/tal-tech/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const (
@@ -171,7 +171,7 @@ func (lt loggedThrottle) allow() (Promise, error) {
 func (lt loggedThrottle) doReq(req func() error, fallback func(err error) error, acceptable Acceptable) error {
 	return lt.logError(lt.internalThrottle.doReq(req, fallback, func(err error) bool {
 		accept := acceptable(err)
-		if !accept && err != nil {
+		if !accept {
 			lt.errWin.add(err.Error())
 		}
 		return accept
@@ -198,7 +198,7 @@ type errorWindow struct {
 
 func (ew *errorWindow) add(reason string) {
 	ew.lock.Lock()
-	ew.reasons[ew.index] = fmt.Sprintf("%s %s", time.Now().Format(timeFormat), reason)
+	ew.reasons[ew.index] = fmt.Sprintf("%s %s", timex.Time().Format(timeFormat), reason)
 	ew.index = (ew.index + 1) % numHistoryReasons
 	ew.count = mathx.MinInt(ew.count+1, numHistoryReasons)
 	ew.lock.Unlock()

core/breaker/breaker_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/stat"
 )
 
 func init() {

core/breaker/breakers_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/stat"
 )
 
 func init() {

core/breaker/googlebreaker.go

@@ -4,8 +4,8 @@ import (
 	"math"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/collection"
-	"github.com/zeromicro/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/collection"
+	"github.com/tal-tech/go-zero/core/mathx"
 )
 
 const (

core/breaker/googlebreaker_test.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/collection"
-	"github.com/zeromicro/go-zero/core/mathx"
-	"github.com/zeromicro/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/collection"
+	"github.com/tal-tech/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/stat"
 )
 
 const (

core/cmdline/input_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/iox"
-	"github.com/zeromicro/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/iox"
+	"github.com/tal-tech/go-zero/core/lang"
 )
 
 func TestEnterToContinue(t *testing.T) {

core/codec/aesecb.go

@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"errors"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/logx"
 )
 
 // ErrPaddingSize indicates bad padding size.

core/codec/rsa_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 const (

core/collection/cache.go

@@ -6,9 +6,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/mathx"
-	"github.com/zeromicro/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/syncx"
 )
 
 const (
@@ -98,18 +98,13 @@ func (c *Cache) Get(key string) (interface{}, bool) {
 
 // Set sets value into c with key.
 func (c *Cache) Set(key string, value interface{}) {
-	c.SetWithExpire(key, value, c.expire)
-}
-
-// SetWithExpire sets value into c with key and expire with the given value.
-func (c *Cache) SetWithExpire(key string, value interface{}, expire time.Duration) {
 	c.lock.Lock()
 	_, ok := c.data[key]
 	c.data[key] = value
 	c.lruCache.add(key)
 	c.lock.Unlock()
 
-	expiry := c.unstableExpiry.AroundDuration(expire)
+	expiry := c.unstableExpiry.AroundDuration(c.expire)
 	if ok {
 		c.timingWheel.MoveTimer(key, expiry)
 	} else {

core/collection/cache_test.go

@@ -18,7 +18,7 @@ func TestCacheSet(t *testing.T) {
 	assert.Nil(t, err)
 
 	cache.Set("first", "first element")
-	cache.SetWithExpire("second", "second element", time.Second*3)
+	cache.Set("second", "second element")
 
 	value, ok := cache.Get("first")
 	assert.True(t, ok)

core/collection/fifo_test.go

@@ -61,41 +61,3 @@ func TestPutMore(t *testing.T) {
 		assert.Equal(t, string(element), string(body.([]byte)))
 	}
 }
-
-func TestPutMoreWithHeaderNotZero(t *testing.T) {
-	elements := [][]byte{
-		[]byte("hello"),
-		[]byte("world"),
-		[]byte("again"),
-	}
-	queue := NewQueue(4)
-	for i := range elements {
-		queue.Put(elements[i])
-	}
-
-	// take 1
-	body, ok := queue.Take()
-	assert.True(t, ok)
-	element, ok := body.([]byte)
-	assert.True(t, ok)
-	assert.Equal(t, element, []byte("hello"))
-
-	// put more
-	queue.Put([]byte("b4"))
-	queue.Put([]byte("b5")) // will store in elements[0]
-	queue.Put([]byte("b6")) // cause expansion
-
-	results := [][]byte{
-		[]byte("world"),
-		[]byte("again"),
-		[]byte("b4"),
-		[]byte("b5"),
-		[]byte("b6"),
-	}
-
-	for _, element := range results {
-		body, ok := queue.Take()
-		assert.True(t, ok)
-		assert.Equal(t, string(element), string(body.([]byte)))
-	}
-}

core/collection/rollingwindow.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 type (

core/collection/rollingwindow_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 const duration = time.Millisecond * 50

core/collection/safemap_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 func TestSafeMap(t *testing.T) {

core/collection/set.go

@@ -1,8 +1,8 @@
 package collection
 
 import (
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/logx"
 )
 
 const (

core/collection/set_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/logx"
 )
 
 func init() {

core/collection/timingwheel.go

@@ -2,22 +2,16 @@ package collection
 
 import (
 	"container/list"
-	"errors"
 	"fmt"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/threading"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const drainWorkers = 8
 
-var (
-	ErrClosed   = errors.New("TimingWheel is closed already")
-	ErrArgument = errors.New("incorrect task argument")
-)
-
 type (
 	// Execute defines the method to execute the task.
 	Execute func(key, value interface{})
@@ -65,15 +59,14 @@ type (
 // NewTimingWheel returns a TimingWheel.
 func NewTimingWheel(interval time.Duration, numSlots int, execute Execute) (*TimingWheel, error) {
 	if interval <= 0 || numSlots <= 0 || execute == nil {
-		return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p",
-			interval, numSlots, execute)
+		return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p", interval, numSlots, execute)
 	}
 
 	return newTimingWheelWithClock(interval, numSlots, execute, timex.NewTicker(interval))
 }
 
-func newTimingWheelWithClock(interval time.Duration, numSlots int, execute Execute,
-	ticker timex.Ticker) (*TimingWheel, error) {
+func newTimingWheelWithClock(interval time.Duration, numSlots int, execute Execute, ticker timex.Ticker) (
+	*TimingWheel, error) {
 	tw := &TimingWheel{
 		interval:      interval,
 		ticker:        ticker,
@@ -96,67 +89,47 @@ func newTimingWheelWithClock(interval time.Duration, numSlots int, execute Execu
 }
 
 // Drain drains all items and executes them.
-func (tw *TimingWheel) Drain(fn func(key, value interface{})) error {
-	select {
-	case tw.drainChannel <- fn:
-		return nil
-	case <-tw.stopChannel:
-		return ErrClosed
-	}
+func (tw *TimingWheel) Drain(fn func(key, value interface{})) {
+	tw.drainChannel <- fn
 }
 
 // MoveTimer moves the task with the given key to the given delay.
-func (tw *TimingWheel) MoveTimer(key interface{}, delay time.Duration) error {
+func (tw *TimingWheel) MoveTimer(key interface{}, delay time.Duration) {
 	if delay <= 0 || key == nil {
-		return ErrArgument
+		return
 	}
 
-	select {
-	case tw.moveChannel <- baseEntry{
+	tw.moveChannel <- baseEntry{
 		delay: delay,
 		key:   key,
-	}:
-		return nil
-	case <-tw.stopChannel:
-		return ErrClosed
 	}
 }
 
 // RemoveTimer removes the task with the given key.
-func (tw *TimingWheel) RemoveTimer(key interface{}) error {
+func (tw *TimingWheel) RemoveTimer(key interface{}) {
 	if key == nil {
-		return ErrArgument
+		return
 	}
 
-	select {
-	case tw.removeChannel <- key:
-		return nil
-	case <-tw.stopChannel:
-		return ErrClosed
-	}
+	tw.removeChannel <- key
 }
 
 // SetTimer sets the task value with the given key to the delay.
-func (tw *TimingWheel) SetTimer(key, value interface{}, delay time.Duration) error {
+func (tw *TimingWheel) SetTimer(key, value interface{}, delay time.Duration) {
 	if delay <= 0 || key == nil {
-		return ErrArgument
+		return
 	}
 
-	select {
-	case tw.setChannel <- timingEntry{
+	tw.setChannel <- timingEntry{
 		baseEntry: baseEntry{
 			delay: delay,
 			key:   key,
 		},
 		value: value,
-	}:
-		return nil
-	case <-tw.stopChannel:
-		return ErrClosed
 	}
 }
 
-// Stop stops tw. No more actions after stopping a TimingWheel.
+// Stop stops tw.
 func (tw *TimingWheel) Stop() {
 	close(tw.stopChannel)
 }

core/collection/timingwheel_test.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/stringx"
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const (
@@ -28,6 +28,7 @@ func TestTimingWheel_Drain(t *testing.T) {
 	ticker := timex.NewFakeTicker()
 	tw, _ := newTimingWheelWithClock(testStep, 10, func(k, v interface{}) {
 	}, ticker)
+	defer tw.Stop()
 	tw.SetTimer("first", 3, testStep*4)
 	tw.SetTimer("second", 5, testStep*7)
 	tw.SetTimer("third", 7, testStep*7)
@@ -55,8 +56,6 @@ func TestTimingWheel_Drain(t *testing.T) {
 	})
 	time.Sleep(time.Millisecond * 100)
 	assert.Equal(t, 0, count)
-	tw.Stop()
-	assert.Equal(t, ErrClosed, tw.Drain(func(key, value interface{}) {}))
 }
 
 func TestTimingWheel_SetTimerSoon(t *testing.T) {
@@ -103,13 +102,6 @@ func TestTimingWheel_SetTimerWrongDelay(t *testing.T) {
 	})
 }
 
-func TestTimingWheel_SetTimerAfterClose(t *testing.T) {
-	ticker := timex.NewFakeTicker()
-	tw, _ := newTimingWheelWithClock(testStep, 10, func(k, v interface{}) {}, ticker)
-	tw.Stop()
-	assert.Equal(t, ErrClosed, tw.SetTimer("any", 3, testStep))
-}
-
 func TestTimingWheel_MoveTimer(t *testing.T) {
 	run := syncx.NewAtomicBool()
 	ticker := timex.NewFakeTicker()
@@ -119,6 +111,7 @@ func TestTimingWheel_MoveTimer(t *testing.T) {
 		assert.Equal(t, 3, v.(int))
 		ticker.Done()
 	}, ticker)
+	defer tw.Stop()
 	tw.SetTimer("any", 3, testStep*4)
 	tw.MoveTimer("any", testStep*7)
 	tw.MoveTimer("any", -testStep)
@@ -132,8 +125,6 @@ func TestTimingWheel_MoveTimer(t *testing.T) {
 	}
 	assert.Nil(t, ticker.Wait(waitTime))
 	assert.True(t, run.True())
-	tw.Stop()
-	assert.Equal(t, ErrClosed, tw.MoveTimer("any", time.Millisecond))
 }
 
 func TestTimingWheel_MoveTimerSoon(t *testing.T) {
@@ -184,7 +175,6 @@ func TestTimingWheel_RemoveTimer(t *testing.T) {
 		ticker.Tick()
 	}
 	tw.Stop()
-	assert.Equal(t, ErrClosed, tw.RemoveTimer("any"))
 }
 
 func TestTimingWheel_SetTimer(t *testing.T) {

core/color/color.go

@@ -1,73 +0,0 @@
-package color
-
-import "github.com/fatih/color"
-
-const (
-	// NoColor is no color for both foreground and background.
-	NoColor Color = iota
-	// FgBlack is the foreground color black.
-	FgBlack
-	// FgRed is the foreground color red.
-	FgRed
-	// FgGreen is the foreground color green.
-	FgGreen
-	// FgYellow is the foreground color yellow.
-	FgYellow
-	// FgBlue is the foreground color blue.
-	FgBlue
-	// FgMagenta is the foreground color magenta.
-	FgMagenta
-	// FgCyan is the foreground color cyan.
-	FgCyan
-	// FgWhite is the foreground color white.
-	FgWhite
-
-	// BgBlack is the background color black.
-	BgBlack
-	// BgRed is the background color red.
-	BgRed
-	// BgGreen is the background color green.
-	BgGreen
-	// BgYellow is the background color yellow.
-	BgYellow
-	// BgBlue is the background color blue.
-	BgBlue
-	// BgMagenta is the background color magenta.
-	BgMagenta
-	// BgCyan is the background color cyan.
-	BgCyan
-	// BgWhite is the background color white.
-	BgWhite
-)
-
-var colors = map[Color][]color.Attribute{
-	FgBlack:   {color.FgBlack, color.Bold},
-	FgRed:     {color.FgRed, color.Bold},
-	FgGreen:   {color.FgGreen, color.Bold},
-	FgYellow:  {color.FgYellow, color.Bold},
-	FgBlue:    {color.FgBlue, color.Bold},
-	FgMagenta: {color.FgMagenta, color.Bold},
-	FgCyan:    {color.FgCyan, color.Bold},
-	FgWhite:   {color.FgWhite, color.Bold},
-	BgBlack:   {color.BgBlack, color.FgHiWhite, color.Bold},
-	BgRed:     {color.BgRed, color.FgHiWhite, color.Bold},
-	BgGreen:   {color.BgGreen, color.FgHiWhite, color.Bold},
-	BgYellow:  {color.BgHiYellow, color.FgHiBlack, color.Bold},
-	BgBlue:    {color.BgBlue, color.FgHiWhite, color.Bold},
-	BgMagenta: {color.BgMagenta, color.FgHiWhite, color.Bold},
-	BgCyan:    {color.BgCyan, color.FgHiWhite, color.Bold},
-	BgWhite:   {color.BgHiWhite, color.FgHiBlack, color.Bold},
-}
-
-type Color uint32
-
-// WithColor returns a string with the given color applied.
-func WithColor(text string, colour Color) string {
-	c := color.New(colors[colour]...)
-	return c.Sprint(text)
-}
-
-// WithColorPadding returns a string with the given color applied with leading and trailing spaces.
-func WithColorPadding(text string, colour Color) string {
-	return WithColor(" "+text+" ", colour)
-}

core/color/color_test.go

@@ -1,17 +0,0 @@
-package color
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestWithColor(t *testing.T) {
-	output := WithColor("Hello", BgRed)
-	assert.Equal(t, "Hello", output)
-}
-
-func TestWithColorPadding(t *testing.T) {
-	output := WithColorPadding("Hello", BgRed)
-	assert.Equal(t, " Hello ", output)
-}

core/conf/config.go

@@ -6,26 +6,24 @@ import (
 	"log"
 	"os"
 	"path"
-	"strings"
 
-	"github.com/zeromicro/go-zero/core/mapping"
+	"github.com/tal-tech/go-zero/core/mapping"
 )
 
 var loaders = map[string]func([]byte, interface{}) error{
-	".json": LoadFromJsonBytes,
-	".toml": LoadFromTomlBytes,
-	".yaml": LoadFromYamlBytes,
-	".yml":  LoadFromYamlBytes,
+	".json": LoadConfigFromJsonBytes,
+	".yaml": LoadConfigFromYamlBytes,
+	".yml":  LoadConfigFromYamlBytes,
 }
 
-// Load loads config into v from file, .json, .yaml and .yml are acceptable.
-func Load(file string, v interface{}, opts ...Option) error {
+// LoadConfig loads config into v from file, .json, .yaml and .yml are acceptable.
+func LoadConfig(file string, v interface{}, opts ...Option) error {
 	content, err := ioutil.ReadFile(file)
 	if err != nil {
 		return err
 	}
 
-	loader, ok := loaders[strings.ToLower(path.Ext(file))]
+	loader, ok := loaders[path.Ext(file)]
 	if !ok {
 		return fmt.Errorf("unrecognized file type: %s", file)
 	}
@@ -42,42 +40,19 @@ func Load(file string, v interface{}, opts ...Option) error {
 	return loader(content, v)
 }
 
-// LoadConfig loads config into v from file, .json, .yaml and .yml are acceptable.
-// Deprecated: use Load instead.
-func LoadConfig(file string, v interface{}, opts ...Option) error {
-	return Load(file, v, opts...)
-}
-
-// LoadFromJsonBytes loads config into v from content json bytes.
-func LoadFromJsonBytes(content []byte, v interface{}) error {
+// LoadConfigFromJsonBytes loads config into v from content json bytes.
+func LoadConfigFromJsonBytes(content []byte, v interface{}) error {
 	return mapping.UnmarshalJsonBytes(content, v)
 }
 
-// LoadConfigFromJsonBytes loads config into v from content json bytes.
-// Deprecated: use LoadFromJsonBytes instead.
-func LoadConfigFromJsonBytes(content []byte, v interface{}) error {
-	return LoadFromJsonBytes(content, v)
-}
-
-// LoadFromTomlBytes loads config into v from content toml bytes.
-func LoadFromTomlBytes(content []byte, v interface{}) error {
-	return mapping.UnmarshalTomlBytes(content, v)
-}
-
-// LoadFromYamlBytes loads config into v from content yaml bytes.
-func LoadFromYamlBytes(content []byte, v interface{}) error {
-	return mapping.UnmarshalYamlBytes(content, v)
-}
-
 // LoadConfigFromYamlBytes loads config into v from content yaml bytes.
-// Deprecated: use LoadFromYamlBytes instead.
 func LoadConfigFromYamlBytes(content []byte, v interface{}) error {
-	return LoadFromYamlBytes(content, v)
+	return mapping.UnmarshalYamlBytes(content, v)
 }
 
 // MustLoad loads config into v from path, exits on error.
 func MustLoad(path string, v interface{}, opts ...Option) {
-	if err := Load(path, v, opts...); err != nil {
+	if err := LoadConfig(path, v, opts...); err != nil {
 		log.Fatalf("error: config file %s, %s", path, err.Error())
 	}
 }

core/conf/config_test.go

@@ -6,19 +6,19 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
-	"github.com/zeromicro/go-zero/core/hash"
+	"github.com/tal-tech/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/hash"
 )
 
 func TestLoadConfig_notExists(t *testing.T) {
-	assert.NotNil(t, Load("not_a_file", nil))
+	assert.NotNil(t, LoadConfig("not_a_file", nil))
 }
 
 func TestLoadConfig_notRecogFile(t *testing.T) {
 	filename, err := fs.TempFilenameWithText("hello")
 	assert.Nil(t, err)
 	defer os.Remove(filename)
-	assert.NotNil(t, Load(filename, nil))
+	assert.NotNil(t, LoadConfig(filename, nil))
 }
 
 func TestConfigJson(t *testing.T) {
@@ -57,58 +57,6 @@ func TestConfigJson(t *testing.T) {
 	}
 }
 
-func TestConfigToml(t *testing.T) {
-	text := `a = "foo"
-b = 1
-c = "${FOO}"
-d = "abcd!@#$112"
-`
-	os.Setenv("FOO", "2")
-	defer os.Unsetenv("FOO")
-	tmpfile, err := createTempFile(".toml", text)
-	assert.Nil(t, err)
-	defer os.Remove(tmpfile)
-
-	var val struct {
-		A string `json:"a"`
-		B int    `json:"b"`
-		C string `json:"c"`
-		D string `json:"d"`
-	}
-	MustLoad(tmpfile, &val)
-	assert.Equal(t, "foo", val.A)
-	assert.Equal(t, 1, val.B)
-	assert.Equal(t, "${FOO}", val.C)
-	assert.Equal(t, "abcd!@#$112", val.D)
-}
-
-func TestConfigTomlEnv(t *testing.T) {
-	text := `a = "foo"
-b = 1
-c = "${FOO}"
-d = "abcd!@#112"
-`
-	os.Setenv("FOO", "2")
-	defer os.Unsetenv("FOO")
-	tmpfile, err := createTempFile(".toml", text)
-	assert.Nil(t, err)
-	defer os.Remove(tmpfile)
-
-	var val struct {
-		A string `json:"a"`
-		B int    `json:"b"`
-		C string `json:"c"`
-		D string `json:"d"`
-	}
-
-	MustLoad(tmpfile, &val, UseEnv())
-	assert.Equal(t, "foo", val.A)
-	assert.Equal(t, 1, val.B)
-	assert.Equal(t, "2", val.C)
-	assert.Equal(t, "abcd!@#112", val.D)
-
-}
-
 func TestConfigJsonEnv(t *testing.T) {
 	tests := []string{
 		".json",

core/conf/properties.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/zeromicro/go-zero/core/iox"
+	"github.com/tal-tech/go-zero/core/iox"
 )
 
 // PropertyError represents a configuration error message.

core/conf/properties_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 func TestProperties(t *testing.T) {

core/conf/readme.md

@@ -1,57 +0,0 @@
-## How to use
-
-1. Define a config structure, like below:
-
-```go
-type RestfulConf struct {
-	Host         string        `json:",default=0.0.0.0"`
-	Port         int
-	LogMode      string        `json:",options=[file,console]"`
-	Verbose      bool          `json:",optional"`
-	MaxConns     int           `json:",default=10000"`
-	MaxBytes     int64         `json:",default=1048576"`
-	Timeout      time.Duration `json:",default=3s"`
-	CpuThreshold int64         `json:",default=900,range=[0:1000]"`
-}
-```
-
-2. Write the yaml, toml or json config file:
-
-- yaml example
-
-```yaml
-# most fields are optional or have default values
-Port: 8080
-LogMode: console
-# you can use env settings
-MaxBytes: ${MAX_BYTES}
-```
-
-- toml example
-
-```toml
-# most fields are optional or have default values
-Port = 8_080
-LogMode = "console"
-# you can use env settings
-MaxBytes = "${MAX_BYTES}"
-```
-
-3. Load the config from a file:
-
-```go
-// exit on error
-var config RestfulConf
-conf.MustLoad(configFile, &config)
-
-// or handle the error on your own
-var config RestfulConf
-if err := conf.Load(configFile, &config); err != nil {
-  log.Fatal(err)
-}
-
-// enable reading from environments
-var config RestfulConf
-conf.MustLoad(configFile, &config, conf.UseEnv())
-```
-

core/contextx/unmarshaler.go

@@ -3,7 +3,7 @@ package contextx
 import (
 	"context"
 
-	"github.com/zeromicro/go-zero/core/mapping"
+	"github.com/tal-tech/go-zero/core/mapping"
 )
 
 const contextTagKey = "ctx"

core/discov/accountregistry.go

@@ -1,6 +1,6 @@
 package discov
 
-import "github.com/zeromicro/go-zero/core/discov/internal"
+import "github.com/tal-tech/go-zero/core/discov/internal"
 
 // RegisterAccount registers the username/password to the given etcd cluster.
 func RegisterAccount(endpoints []string, user, pass string) {

core/discov/accountregistry_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/discov/internal"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 func TestRegisterAccount(t *testing.T) {

core/discov/clients.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/zeromicro/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/discov/internal"
 )
 
 const (

core/discov/clients_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/discov/internal"
 )
 
 var mockLock sync.Mutex

core/discov/config.go

@@ -2,13 +2,6 @@ package discov
 
 import "errors"
 
-var (
-	// errEmptyEtcdHosts indicates that etcd hosts are empty.
-	errEmptyEtcdHosts = errors.New("empty etcd hosts")
-	// errEmptyEtcdKey indicates that etcd key is empty.
-	errEmptyEtcdKey = errors.New("empty etcd key")
-)
-
 // EtcdConf is the config item with the given key on etcd.
 type EtcdConf struct {
 	Hosts              []string
@@ -34,9 +27,9 @@ func (c EtcdConf) HasTLS() bool {
 // Validate validates c.
 func (c EtcdConf) Validate() error {
 	if len(c.Hosts) == 0 {
-		return errEmptyEtcdHosts
+		return errors.New("empty etcd hosts")
 	} else if len(c.Key) == 0 {
-		return errEmptyEtcdKey
+		return errors.New("empty etcd key")
 	} else {
 		return nil
 	}

core/discov/internal/accountmanager_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 func TestAccount(t *testing.T) {

core/discov/internal/registry.go

@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/contextx"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/contextx"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/threading"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
@@ -191,11 +191,9 @@ func (c *cluster) handleWatchEvents(key string, events []*clientv3.Event) {
 				})
 			}
 		case clientv3.EventTypeDelete:
-			c.lock.Lock()
 			if vals, ok := c.values[key]; ok {
 				delete(vals, string(ev.Kv.Key))
 			}
-			c.lock.Unlock()
 			for _, l := range listeners {
 				l.OnDelete(KV{
 					Key: string(ev.Kv.Key),

core/discov/internal/registry_test.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/contextx"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/contextx"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stringx"
 	"go.etcd.io/etcd/api/v3/mvccpb"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )

core/discov/publisher.go

@@ -1,12 +1,12 @@
 package discov
 
 import (
-	"github.com/zeromicro/go-zero/core/discov/internal"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/proc"
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/proc"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/threading"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 

core/discov/publisher_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/discov/internal"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stringx"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
 

core/discov/subscriber.go

@@ -4,9 +4,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/zeromicro/go-zero/core/discov/internal"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/syncx"
 )
 
 type (

core/discov/subscriber_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/discov/internal"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/discov/internal"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 const (

core/errorx/batcherror.go

@@ -11,12 +11,10 @@ type (
 	errorArray []error
 )
 
-// Add adds errs to be, nil errors are ignored.
-func (be *BatchError) Add(errs ...error) {
-	for _, err := range errs {
-		if err != nil {
-			be.errs = append(be.errs, err)
-		}
+// Add adds err to be.
+func (be *BatchError) Add(err error) {
+	if err != nil {
+		be.errs = append(be.errs, err)
 	}
 }
 

core/executors/delayexecutor.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/threading"
 )
 
 // A DelayExecutor delays a tasks on given delay interval.

core/executors/lessexecutor.go

@@ -3,8 +3,8 @@ package executors
 import (
 	"time"
 
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 // A LessExecutor is an executor to limit execution once within given time interval.

core/executors/lessexecutor_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 func TestLessExecutor_DoOrDiscard(t *testing.T) {

core/executors/periodicalexecutor.go

@@ -6,11 +6,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/proc"
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/threading"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/proc"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const idleRound = 10

core/executors/periodicalexecutor_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const threshold = 10

core/filex/file_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 const (

core/filex/lookup_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 func TestSplitLineChunks(t *testing.T) {

core/filex/rangereader.go

@@ -5,9 +5,6 @@ import (
 	"os"
 )
 
-// errExceedFileSize indicates that the file size is exceeded.
-var errExceedFileSize = errors.New("exceed file size")
-
 // A RangeReader is used to read a range of content from a file.
 type RangeReader struct {
 	file  *os.File
@@ -32,7 +29,7 @@ func (rr *RangeReader) Read(p []byte) (n int, err error) {
 	}
 
 	if rr.stop < rr.start || rr.start >= stat.Size() {
-		return 0, errExceedFileSize
+		return 0, errors.New("exceed file size")
 	}
 
 	if rr.stop-rr.start < int64(len(p)) {

core/filex/rangereader_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 func TestRangeReader(t *testing.T) {

core/fs/temps.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/zeromicro/go-zero/core/hash"
+	"github.com/tal-tech/go-zero/core/hash"
 )
 
 // TempFileWithText creates the temporary file with the given content,

core/fs/temps_test.go

@@ -1,49 +0,0 @@
-package fs
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestTempFileWithText(t *testing.T) {
-	f, err := TempFileWithText("test")
-	if err != nil {
-		t.Error(err)
-	}
-	if f == nil {
-		t.Error("TempFileWithText returned nil")
-	}
-	if f.Name() == "" {
-		t.Error("TempFileWithText returned empty file name")
-	}
-	defer os.Remove(f.Name())
-
-	bs, err := ioutil.ReadAll(f)
-	assert.Nil(t, err)
-	if len(bs) != 4 {
-		t.Error("TempFileWithText returned wrong file size")
-	}
-	if f.Close() != nil {
-		t.Error("TempFileWithText returned error on close")
-	}
-}
-
-func TestTempFilenameWithText(t *testing.T) {
-	f, err := TempFilenameWithText("test")
-	if err != nil {
-		t.Error(err)
-	}
-	if f == "" {
-		t.Error("TempFilenameWithText returned empty file name")
-	}
-	defer os.Remove(f)
-
-	bs, err := ioutil.ReadFile(f)
-	assert.Nil(t, err)
-	if len(bs) != 4 {
-		t.Error("TempFilenameWithText returned wrong file size")
-	}
-}

core/fx/parallel.go

@@ -1,6 +1,6 @@
 package fx
 
-import "github.com/zeromicro/go-zero/core/threading"
+import "github.com/tal-tech/go-zero/core/threading"
 
 // Parallel runs fns parallelly and waits for done.
 func Parallel(fns ...func()) {

core/fx/retry.go

@@ -1,6 +1,6 @@
 package fx
 
-import "github.com/zeromicro/go-zero/core/errorx"
+import "github.com/tal-tech/go-zero/core/errorx"
 
 const defaultRetryTimes = 3
 

core/fx/stream.go

@@ -4,9 +4,9 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/zeromicro/go-zero/core/collection"
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/threading"
+	"github.com/tal-tech/go-zero/core/collection"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/threading"
 )
 
 const (

core/fx/stream_test.go

@@ -13,8 +13,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stringx"
-	"go.uber.org/goleak"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 func TestBuffer(t *testing.T) {
@@ -564,6 +563,9 @@ func equal(t *testing.T, stream Stream, data []interface{}) {
 }
 
 func runCheckedTest(t *testing.T, fn func(t *testing.T)) {
-	defer goleak.VerifyNone(t)
+	goroutines := runtime.NumGoroutine()
 	fn(t)
+	// let scheduler schedule first
+	time.Sleep(time.Millisecond)
+	assert.True(t, runtime.NumGoroutine() <= goroutines)
 }

core/hash/consistenthash.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/mapping"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/mapping"
 )
 
 const (

core/hash/consistenthash_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/mathx"
 )
 
 const (

core/iox/read_test.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
-	"github.com/zeromicro/go-zero/core/stringx"
+	"github.com/tal-tech/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/stringx"
 )
 
 func TestReadText(t *testing.T) {

core/jsonx/json.go

@@ -13,16 +13,6 @@ func Marshal(v interface{}) ([]byte, error) {
 	return json.Marshal(v)
 }
 
-// MarshalToString marshals v into a string.
-func MarshalToString(v interface{}) (string, error) {
-	data, err := Marshal(v)
-	if err != nil {
-		return "", err
-	}
-
-	return string(data), nil
-}
-
 // Unmarshal unmarshals data bytes into v.
 func Unmarshal(data []byte, v interface{}) error {
 	decoder := json.NewDecoder(bytes.NewReader(data))
@@ -61,5 +51,5 @@ func unmarshalUseNumber(decoder *json.Decoder, v interface{}) error {
 }
 
 func formatError(v string, err error) error {
-	return fmt.Errorf("string: `%s`, error: `%w`", v, err)
+	return fmt.Errorf("string: `%s`, error: `%s`", v, err.Error())
 }

core/jsonx/json_test.go

@@ -1,103 +0,0 @@
-package jsonx
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestMarshal(t *testing.T) {
-	var v = struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}{
-		Name: "John",
-		Age:  30,
-	}
-	bs, err := Marshal(v)
-	assert.Nil(t, err)
-	assert.Equal(t, `{"name":"John","age":30}`, string(bs))
-}
-
-func TestMarshalToString(t *testing.T) {
-	var v = struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}{
-		Name: "John",
-		Age:  30,
-	}
-	toString, err := MarshalToString(v)
-	assert.Nil(t, err)
-	assert.Equal(t, `{"name":"John","age":30}`, toString)
-
-	_, err = MarshalToString(make(chan int))
-	assert.NotNil(t, err)
-}
-
-func TestUnmarshal(t *testing.T) {
-	const s = `{"name":"John","age":30}`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := Unmarshal([]byte(s), &v)
-	assert.Nil(t, err)
-	assert.Equal(t, "John", v.Name)
-	assert.Equal(t, 30, v.Age)
-}
-
-func TestUnmarshalError(t *testing.T) {
-	const s = `{"name":"John","age":30`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := Unmarshal([]byte(s), &v)
-	assert.NotNil(t, err)
-}
-
-func TestUnmarshalFromString(t *testing.T) {
-	const s = `{"name":"John","age":30}`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := UnmarshalFromString(s, &v)
-	assert.Nil(t, err)
-	assert.Equal(t, "John", v.Name)
-	assert.Equal(t, 30, v.Age)
-}
-
-func TestUnmarshalFromStringError(t *testing.T) {
-	const s = `{"name":"John","age":30`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := UnmarshalFromString(s, &v)
-	assert.NotNil(t, err)
-}
-
-func TestUnmarshalFromRead(t *testing.T) {
-	const s = `{"name":"John","age":30}`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := UnmarshalFromReader(strings.NewReader(s), &v)
-	assert.Nil(t, err)
-	assert.Equal(t, "John", v.Name)
-	assert.Equal(t, 30, v.Age)
-}
-
-func TestUnmarshalFromReaderError(t *testing.T) {
-	const s = `{"name":"John","age":30`
-	var v struct {
-		Name string `json:"name"`
-		Age  int    `json:"age"`
-	}
-	err := UnmarshalFromReader(strings.NewReader(s), &v)
-	assert.NotNil(t, err)
-}

core/limit/periodlimit.go

@@ -1,28 +1,30 @@
 package limit
 
 import (
-	"context"
 	"errors"
 	"strconv"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/tal-tech/go-zero/core/stores/redis"
 )
 
-// to be compatible with aliyun redis, we cannot use `local key = KEYS[1]` to reuse the key
-const periodScript = `local limit = tonumber(ARGV[1])
+const (
+	// to be compatible with aliyun redis, we cannot use `local key = KEYS[1]` to reuse the key
+	periodScript = `local limit = tonumber(ARGV[1])
 local window = tonumber(ARGV[2])
 local current = redis.call("INCRBY", KEYS[1], 1)
 if current == 1 then
     redis.call("expire", KEYS[1], window)
-end
-if current < limit then
+    return 1
+elseif current < limit then
     return 1
 elseif current == limit then
     return 2
 else
     return 0
 end`
+	zoneDiff = 3600 * 8 // GMT+8 for our services
+)
 
 const (
 	// Unknown means not initialized state.
@@ -75,12 +77,7 @@ func NewPeriodLimit(period, quota int, limitStore *redis.Redis, keyPrefix string
 
 // Take requests a permit, it returns the permit state.
 func (h *PeriodLimit) Take(key string) (int, error) {
-	return h.TakeCtx(context.Background(), key)
-}
-
-// TakeCtx requests a permit with context, it returns the permit state.
-func (h *PeriodLimit) TakeCtx(ctx context.Context, key string) (int, error) {
-	resp, err := h.limitStore.EvalCtx(ctx, periodScript, []string{h.keyPrefix + key}, []string{
+	resp, err := h.limitStore.Eval(periodScript, []string{h.keyPrefix + key}, []string{
 		strconv.Itoa(h.quota),
 		strconv.Itoa(h.calcExpireSeconds()),
 	})
@@ -107,9 +104,7 @@ func (h *PeriodLimit) TakeCtx(ctx context.Context, key string) (int, error) {
 
 func (h *PeriodLimit) calcExpireSeconds() int {
 	if h.align {
-		now := time.Now()
-		_, offset := now.Zone()
-		unix := now.Unix() + int64(offset)
+		unix := time.Now().Unix() + zoneDiff
 		return h.period - int(unix%int64(h.period))
 	}
 
@@ -117,8 +112,6 @@ func (h *PeriodLimit) calcExpireSeconds() int {
 }
 
 // Align returns a func to customize a PeriodLimit with alignment.
-// For example, if we want to limit end users with 5 sms verification messages every day,
-// we need to align with the local timezone and the start of the day.
 func Align() PeriodOption {
 	return func(l *PeriodLimit) {
 		l.align = true

core/limit/periodlimit_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/stores/redis"
-	"github.com/zeromicro/go-zero/core/stores/redis/redistest"
+	"github.com/tal-tech/go-zero/core/stores/redis"
+	"github.com/tal-tech/go-zero/core/stores/redis/redistest"
 )
 
 func TestPeriodLimit_Take(t *testing.T) {
@@ -23,9 +23,10 @@ func TestPeriodLimit_RedisUnavailable(t *testing.T) {
 
 	const (
 		seconds = 1
+		total   = 100
 		quota   = 5
 	)
-	l := NewPeriodLimit(seconds, quota, redis.New(s.Addr()), "periodlimit")
+	l := NewPeriodLimit(seconds, quota, redis.NewRedis(s.Addr(), redis.NodeType), "periodlimit")
 	s.Close()
 	val, err := l.Take("first")
 	assert.NotNil(t, err)
@@ -65,13 +66,3 @@ func testPeriodLimit(t *testing.T, opts ...PeriodOption) {
 	assert.Equal(t, 1, hitQuota)
 	assert.Equal(t, total-quota, overQuota)
 }
-
-func TestQuotaFull(t *testing.T) {
-	s, err := miniredis.Run()
-	assert.Nil(t, err)
-
-	l := NewPeriodLimit(1, 1, redis.New(s.Addr()), "periodlimit")
-	val, err := l.Take("first")
-	assert.Nil(t, err)
-	assert.Equal(t, HitQuota, val)
-}

core/limit/tokenlimit.go

@@ -7,8 +7,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stores/redis"
 	xrate "golang.org/x/time/rate"
 )
 
@@ -85,8 +85,8 @@ func (lim *TokenLimiter) Allow() bool {
 }
 
 // AllowN reports whether n events may happen at time now.
-// Use this method if you intend to drop / skip events that exceed the rate.
-// Otherwise, use Reserve or Wait.
+// Use this method if you intend to drop / skip events that exceed the rate rate.
+// Otherwise use Reserve or Wait.
 func (lim *TokenLimiter) AllowN(now time.Time, n int) bool {
 	return lim.reserveN(now, n)
 }
@@ -112,8 +112,7 @@ func (lim *TokenLimiter) reserveN(now time.Time, n int) bool {
 	// Lua boolean false -> r Nil bulk reply
 	if err == redis.Nil {
 		return false
-	}
-	if err != nil {
+	} else if err != nil {
 		logx.Errorf("fail to use rate limiter: %s, use in-process limiter for rescue", err)
 		lim.startMonitor()
 		return lim.rescueLimiter.AllowN(now, n)

core/limit/tokenlimit_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stores/redis"
-	"github.com/zeromicro/go-zero/core/stores/redis/redistest"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stores/redis"
+	"github.com/tal-tech/go-zero/core/stores/redis/redistest"
 )
 
 func init() {

core/load/adaptiveshedder.go

@@ -7,11 +7,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/collection"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stat"
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/collection"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const (

core/load/adaptiveshedder_test.go

@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/collection"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/mathx"
-	"github.com/zeromicro/go-zero/core/stat"
-	"github.com/zeromicro/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/collection"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/mathx"
+	"github.com/tal-tech/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/syncx"
 )
 
 const (

core/load/sheddergroup.go

@@ -3,7 +3,7 @@ package load
 import (
 	"io"
 
-	"github.com/zeromicro/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/syncx"
 )
 
 // A ShedderGroup is a manager to manage key based shedders.

core/load/sheddingstat.go

@@ -4,8 +4,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stat"
+	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/tal-tech/go-zero/core/stat"
 )
 
 type (

core/logx/color.go

@@ -1,26 +0,0 @@
-package logx
-
-import (
-	"sync/atomic"
-
-	"github.com/zeromicro/go-zero/core/color"
-)
-
-// WithColor is a helper function to add color to a string, only in plain encoding.
-func WithColor(text string, colour color.Color) string {
-	if atomic.LoadUint32(&encoding) == plainEncodingType {
-		return color.WithColor(text, colour)
-	}
-
-	return text
-}
-
-// WithColorPadding is a helper function to add color to a string with leading and trailing spaces,
-// only in plain encoding.
-func WithColorPadding(text string, colour color.Color) string {
-	if atomic.LoadUint32(&encoding) == plainEncodingType {
-		return color.WithColorPadding(text, colour)
-	}
-
-	return text
-}

core/logx/color_test.go

@@ -1,33 +0,0 @@
-package logx
-
-import (
-	"sync/atomic"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/color"
-)
-
-func TestWithColor(t *testing.T) {
-	old := atomic.SwapUint32(&encoding, plainEncodingType)
-	defer atomic.StoreUint32(&encoding, old)
-
-	output := WithColor("hello", color.BgBlue)
-	assert.Equal(t, "hello", output)
-
-	atomic.StoreUint32(&encoding, jsonEncodingType)
-	output = WithColor("hello", color.BgBlue)
-	assert.Equal(t, "hello", output)
-}
-
-func TestWithColorPadding(t *testing.T) {
-	old := atomic.SwapUint32(&encoding, plainEncodingType)
-	defer atomic.StoreUint32(&encoding, old)
-
-	output := WithColorPadding("hello", color.BgBlue)
-	assert.Equal(t, " hello ", output)
-
-	atomic.StoreUint32(&encoding, jsonEncodingType)
-	output = WithColorPadding("hello", color.BgBlue)
-	assert.Equal(t, "hello", output)
-}

core/logx/config.go

@@ -3,11 +3,10 @@ package logx
 // A LogConf is a logging config.
 type LogConf struct {
 	ServiceName         string `json:",optional"`
-	Mode                string `json:",default=console,options=[console,file,volume]"`
-	Encoding            string `json:",default=json,options=[json,plain]"`
+	Mode                string `json:",default=console,options=console|file|volume"`
 	TimeFormat          string `json:",optional"`
 	Path                string `json:",default=logs"`
-	Level               string `json:",default=info,options=[info,error,severe]"`
+	Level               string `json:",default=info,options=info|error|severe"`
 	Compress            bool   `json:",optional"`
 	KeepDays            int    `json:",optional"`
 	StackCooldownMillis int    `json:",default=100"`

core/logx/durationlogger.go

@@ -1,13 +1,17 @@
 package logx
 
 import (
-	"context"
 	"fmt"
+	"io"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
+const durationCallerDepth = 3
+
+type durationLogger logEntry
+
 // WithDuration returns a Logger which logs the given duration.
 func WithDuration(d time.Duration) Logger {
 	return &durationLogger{
@@ -15,62 +19,57 @@ func WithDuration(d time.Duration) Logger {
 	}
 }
 
-type durationLogger logEntry
-
 func (l *durationLogger) Error(v ...interface{}) {
-	l.err(fmt.Sprint(v...))
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, formatWithCaller(fmt.Sprint(v...), durationCallerDepth))
+	}
 }
 
 func (l *durationLogger) Errorf(format string, v ...interface{}) {
-	l.err(fmt.Sprintf(format, v...))
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, formatWithCaller(fmt.Sprintf(format, v...), durationCallerDepth))
+	}
 }
 
 func (l *durationLogger) Errorv(v interface{}) {
-	l.err(v)
-}
-
-func (l *durationLogger) Errorw(msg string, fields ...LogField) {
-	l.err(msg, fields...)
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, v)
+	}
 }
 
 func (l *durationLogger) Info(v ...interface{}) {
-	l.info(fmt.Sprint(v...))
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, fmt.Sprint(v...))
+	}
 }
 
 func (l *durationLogger) Infof(format string, v ...interface{}) {
-	l.info(fmt.Sprintf(format, v...))
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, fmt.Sprintf(format, v...))
+	}
 }
 
 func (l *durationLogger) Infov(v interface{}) {
-	l.info(v)
-}
-
-func (l *durationLogger) Infow(msg string, fields ...LogField) {
-	l.info(msg, fields...)
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, v)
+	}
 }
 
 func (l *durationLogger) Slow(v ...interface{}) {
-	l.slow(fmt.Sprint(v...))
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, fmt.Sprint(v...))
+	}
 }
 
 func (l *durationLogger) Slowf(format string, v ...interface{}) {
-	l.slow(fmt.Sprintf(format, v...))
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, fmt.Sprintf(format, v...))
+	}
 }
 
 func (l *durationLogger) Slowv(v interface{}) {
-	l.slow(v)
-}
-
-func (l *durationLogger) Sloww(msg string, fields ...LogField) {
-	l.slow(msg, fields...)
-}
-
-func (l *durationLogger) WithContext(ctx context.Context) Logger {
-	return &traceLogger{
-		ctx: ctx,
-		logEntry: logEntry{
-			Duration: l.Duration,
-		},
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, v)
 	}
 }
 
@@ -79,23 +78,11 @@ func (l *durationLogger) WithDuration(duration time.Duration) Logger {
 	return l
 }
 
-func (l *durationLogger) err(v interface{}, fields ...LogField) {
-	if shallLog(ErrorLevel) {
-		fields = append(fields, Field(durationKey, l.Duration))
-		getWriter().Error(v, fields...)
-	}
-}
-
-func (l *durationLogger) info(v interface{}, fields ...LogField) {
-	if shallLog(InfoLevel) {
-		fields = append(fields, Field(durationKey, l.Duration))
-		getWriter().Info(v, fields...)
-	}
-}
-
-func (l *durationLogger) slow(v interface{}, fields ...LogField) {
-	if shallLog(ErrorLevel) {
-		fields = append(fields, Field(durationKey, l.Duration))
-		getWriter().Slow(v, fields...)
-	}
+func (l *durationLogger) write(writer io.Writer, level string, val interface{}) {
+	outputJson(writer, &durationLogger{
+		Timestamp: getTimestamp(),
+		Level:     level,
+		Content:   val,
+		Duration:  l.Duration,
+	})
 }

core/logx/durationlogger_test.go

@@ -1,161 +1,73 @@
 package logx
 
 import (
-	"context"
+	"log"
 	"strings"
-	"sync/atomic"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/otel"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
 func TestWithDurationError(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Error("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationErrorf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Errorf("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationErrorv(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Errorv("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-}
-
-func TestWithDurationErrorw(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	WithDuration(time.Second).Errorw("foo", Field("foo", "bar"))
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationInfo(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Info("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-}
-
-func TestWithDurationInfoConsole(t *testing.T) {
-	old := atomic.LoadUint32(&encoding)
-	atomic.StoreUint32(&encoding, plainEncodingType)
-	defer func() {
-		atomic.StoreUint32(&encoding, old)
-	}()
-
-	w := new(mockWriter)
-	o := writer.Swap(w)
-	defer writer.Store(o)
-
-	WithDuration(time.Second).Info("foo")
-	assert.True(t, strings.Contains(w.String(), "ms"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationInfof(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Infof("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationInfov(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Infov("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-}
-
-func TestWithDurationInfow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	WithDuration(time.Second).Infow("foo", Field("foo", "bar"))
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
-}
-
-func TestWithDurationWithContextInfow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	otp := otel.GetTracerProvider()
-	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
-	otel.SetTracerProvider(tp)
-	defer otel.SetTracerProvider(otp)
-
-	ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar")
-	WithDuration(time.Second).WithContext(ctx).Infow("foo", Field("foo", "bar"))
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
-	assert.True(t, strings.Contains(w.String(), "trace"), w.String())
-	assert.True(t, strings.Contains(w.String(), "span"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationSlow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).Slow("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationSlowf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).WithDuration(time.Hour).Slowf("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }
 
 func TestWithDurationSlowv(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	WithDuration(time.Second).WithDuration(time.Hour).Slowv("foo")
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-}
-
-func TestWithDurationSloww(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	WithDuration(time.Second).WithDuration(time.Hour).Sloww("foo", Field("foo", "bar"))
-	assert.True(t, strings.Contains(w.String(), "duration"), w.String())
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
+	assert.True(t, strings.Contains(builder.String(), "duration"), builder.String())
 }

core/logx/lesslogger_test.go

@@ -1,6 +1,7 @@
 package logx
 
 import (
+	"log"
 	"strings"
 	"testing"
 
@@ -8,27 +9,23 @@ import (
 )
 
 func TestLessLogger_Error(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	l := NewLessLogger(500)
 	for i := 0; i < 100; i++ {
 		l.Error("hello")
 	}
 
-	assert.Equal(t, 1, strings.Count(w.String(), "\n"))
+	assert.Equal(t, 1, strings.Count(builder.String(), "\n"))
 }
 
 func TestLessLogger_Errorf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	var builder strings.Builder
+	log.SetOutput(&builder)
 	l := NewLessLogger(500)
 	for i := 0; i < 100; i++ {
 		l.Errorf("hello")
 	}
 
-	assert.Equal(t, 1, strings.Count(w.String(), "\n"))
+	assert.Equal(t, 1, strings.Count(builder.String(), "\n"))
 }

core/logx/limitedexecutor.go

@@ -4,8 +4,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/syncx"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/syncx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 type limitedExecutor struct {

core/logx/limitedexecutor_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 func TestLimitedExecutor_logOrDiscard(t *testing.T) {

core/logx/logger.go

@@ -1,38 +0,0 @@
-package logx
-
-import (
-	"context"
-	"time"
-)
-
-// A Logger represents a logger.
-type Logger interface {
-	// Error logs a message at error level.
-	Error(...interface{})
-	// Errorf logs a message at error level.
-	Errorf(string, ...interface{})
-	// Errorv logs a message at error level.
-	Errorv(interface{})
-	// Errorw logs a message at error level.
-	Errorw(string, ...LogField)
-	// Info logs a message at info level.
-	Info(...interface{})
-	// Infof logs a message at info level.
-	Infof(string, ...interface{})
-	// Infov logs a message at info level.
-	Infov(interface{})
-	// Infow logs a message at info level.
-	Infow(string, ...LogField)
-	// Slow logs a message at slow level.
-	Slow(...interface{})
-	// Slowf logs a message at slow level.
-	Slowf(string, ...interface{})
-	// Slowv logs a message at slow level.
-	Slowv(interface{})
-	// Sloww logs a message at slow level.
-	Sloww(string, ...LogField)
-	// WithContext returns a new logger with the given context.
-	WithContext(context.Context) Logger
-	// WithDuration returns a new logger with the given duration.
-	WithDuration(time.Duration) Logger
-}

core/logx/logs.go

@@ -1,29 +1,82 @@
 package logx
 
 import (
+	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"os"
 	"path"
+	"runtime"
 	"runtime/debug"
+	"strconv"
+	"strings"
+	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/sysx"
+	"github.com/tal-tech/go-zero/core/iox"
+	"github.com/tal-tech/go-zero/core/sysx"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
-const callerDepth = 5
+const (
+	// InfoLevel logs everything
+	InfoLevel = iota
+	// ErrorLevel includes errors, slows, stacks
+	ErrorLevel
+	// SevereLevel only log severe messages
+	SevereLevel
+)
+
+const (
+	accessFilename = "access.log"
+	errorFilename  = "error.log"
+	severeFilename = "severe.log"
+	slowFilename   = "slow.log"
+	statFilename   = "stat.log"
+
+	consoleMode = "console"
+	volumeMode  = "volume"
+
+	levelAlert  = "alert"
+	levelInfo   = "info"
+	levelError  = "error"
+	levelSevere = "severe"
+	levelFatal  = "fatal"
+	levelSlow   = "slow"
+	levelStat   = "stat"
+
+	backupFileDelimiter = "-"
+	callerInnerDepth    = 5
+	flags               = 0x0
+)
 
 var (
-	timeFormat = "2006-01-02T15:04:05.000Z07:00"
-	logLevel   uint32
-	encoding   uint32 = jsonEncodingType
+	// ErrLogPathNotSet is an error that indicates the log path is not set.
+	ErrLogPathNotSet = errors.New("log path must be set")
+	// ErrLogNotInitialized is an error that log is not initialized.
+	ErrLogNotInitialized = errors.New("log not initialized")
+	// ErrLogServiceNameNotSet is an error that indicates that the service name is not set.
+	ErrLogServiceNameNotSet = errors.New("log service name must be set")
+
+	timeFormat   = "2006-01-02T15:04:05.000Z07"
+	writeConsole bool
+	logLevel     uint32
 	// use uint32 for atomic operations
 	disableStat uint32
+	infoLog     io.WriteCloser
+	errorLog    io.WriteCloser
+	severeLog   io.WriteCloser
+	slowLog     io.WriteCloser
+	statLog     io.WriteCloser
+	stackLog    io.Writer
 
-	options logOptions
-	writer  = new(atomicWriter)
+	once        sync.Once
+	initialized uint32
+	options     logOptions
 )
 
 type (
@@ -31,37 +84,103 @@ type (
 		Timestamp string      `json:"@timestamp"`
 		Level     string      `json:"level"`
 		Duration  string      `json:"duration,omitempty"`
-		Caller    string      `json:"caller,omitempty"`
 		Content   interface{} `json:"content"`
 	}
 
-	logEntryWithFields map[string]interface{}
-
 	logOptions struct {
 		gzipEnabled           bool
 		logStackCooldownMills int
 		keepDays              int
 	}
 
-	// LogField is a key-value pair that will be added to the log entry.
-	LogField struct {
-		Key   string
-		Value interface{}
-	}
-
 	// LogOption defines the method to customize the logging.
 	LogOption func(options *logOptions)
+
+	// A Logger represents a logger.
+	Logger interface {
+		Error(...interface{})
+		Errorf(string, ...interface{})
+		Errorv(interface{})
+		Info(...interface{})
+		Infof(string, ...interface{})
+		Infov(interface{})
+		Slow(...interface{})
+		Slowf(string, ...interface{})
+		Slowv(interface{})
+		WithDuration(time.Duration) Logger
+	}
 )
 
+// MustSetup sets up logging with given config c. It exits on error.
+func MustSetup(c LogConf) {
+	Must(SetUp(c))
+}
+
+// SetUp sets up the logx. If already set up, just return nil.
+// we allow SetUp to be called multiple times, because for example
+// we need to allow different service frameworks to initialize logx respectively.
+// the same logic for SetUp
+func SetUp(c LogConf) error {
+	if len(c.TimeFormat) > 0 {
+		timeFormat = c.TimeFormat
+	}
+
+	switch c.Mode {
+	case consoleMode:
+		setupWithConsole(c)
+		return nil
+	case volumeMode:
+		return setupWithVolume(c)
+	default:
+		return setupWithFiles(c)
+	}
+}
+
 // Alert alerts v in alert level, and the message is written to error log.
 func Alert(v string) {
-	getWriter().Alert(v)
+	outputText(errorLog, levelAlert, v)
 }
 
 // Close closes the logging.
 func Close() error {
-	if w := writer.Swap(nil); w != nil {
-		return w.(io.Closer).Close()
+	if writeConsole {
+		return nil
+	}
+
+	if atomic.LoadUint32(&initialized) == 0 {
+		return ErrLogNotInitialized
+	}
+
+	atomic.StoreUint32(&initialized, 0)
+
+	if infoLog != nil {
+		if err := infoLog.Close(); err != nil {
+			return err
+		}
+	}
+
+	if errorLog != nil {
+		if err := errorLog.Close(); err != nil {
+			return err
+		}
+	}
+
+	if severeLog != nil {
+		if err := severeLog.Close(); err != nil {
+			return err
+		}
+	}
+
+	if slowLog != nil {
+		if err := slowLog.Close(); err != nil {
+			return err
+		}
+	}
+
+	if statLog != nil {
+		if err := statLog.Close(); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -69,7 +188,16 @@ func Close() error {
 
 // Disable disables the logging.
 func Disable() {
-	writer.Store(nopWriter{})
+	once.Do(func() {
+		atomic.StoreUint32(&initialized, 1)
+
+		infoLog = iox.NopCloser(ioutil.Discard)
+		errorLog = iox.NopCloser(ioutil.Discard)
+		severeLog = iox.NopCloser(ioutil.Discard)
+		slowLog = iox.NopCloser(ioutil.Discard)
+		statLog = iox.NopCloser(ioutil.Discard)
+		stackLog = ioutil.Discard
+	})
 }
 
 // DisableStat disables the stat logs.
@@ -79,12 +207,22 @@ func DisableStat() {
 
 // Error writes v into error log.
 func Error(v ...interface{}) {
-	errorTextSync(fmt.Sprint(v...))
+	ErrorCaller(1, v...)
+}
+
+// ErrorCaller writes v with context into error log.
+func ErrorCaller(callDepth int, v ...interface{}) {
+	errorTextSync(fmt.Sprint(v...), callDepth+callerInnerDepth)
+}
+
+// ErrorCallerf writes v with context in format into error log.
+func ErrorCallerf(callDepth int, format string, v ...interface{}) {
+	errorTextSync(fmt.Errorf(format, v...).Error(), callDepth+callerInnerDepth)
 }
 
 // Errorf writes v with format into error log.
 func Errorf(format string, v ...interface{}) {
-	errorTextSync(fmt.Errorf(format, v...).Error())
+	ErrorCallerf(1, format, v...)
 }
 
 // ErrorStack writes v along with call stack into error log.
@@ -105,49 +243,6 @@ func Errorv(v interface{}) {
 	errorAnySync(v)
 }
 
-// Errorw writes msg along with fields into error log.
-func Errorw(msg string, fields ...LogField) {
-	errorFieldsSync(msg, fields...)
-}
-
-// Field returns a LogField for the given key and value.
-func Field(key string, value interface{}) LogField {
-	switch val := value.(type) {
-	case error:
-		return LogField{Key: key, Value: val.Error()}
-	case []error:
-		var errs []string
-		for _, err := range val {
-			errs = append(errs, err.Error())
-		}
-		return LogField{Key: key, Value: errs}
-	case time.Duration:
-		return LogField{Key: key, Value: fmt.Sprint(val)}
-	case []time.Duration:
-		var durs []string
-		for _, dur := range val {
-			durs = append(durs, fmt.Sprint(dur))
-		}
-		return LogField{Key: key, Value: durs}
-	case []time.Time:
-		var times []string
-		for _, t := range val {
-			times = append(times, fmt.Sprint(t))
-		}
-		return LogField{Key: key, Value: times}
-	case fmt.Stringer:
-		return LogField{Key: key, Value: val.String()}
-	case []fmt.Stringer:
-		var strs []string
-		for _, str := range val {
-			strs = append(strs, str.String())
-		}
-		return LogField{Key: key, Value: strs}
-	default:
-		return LogField{Key: key, Value: val}
-	}
-}
-
 // Info writes v into access log.
 func Info(v ...interface{}) {
 	infoTextSync(fmt.Sprint(v...))
@@ -163,32 +258,14 @@ func Infov(v interface{}) {
 	infoAnySync(v)
 }
 
-// Infow writes msg along with fields into access log.
-func Infow(msg string, fields ...LogField) {
-	infoFieldsSync(msg, fields...)
-}
-
-// Must checks if err is nil, otherwise logs the error and exits.
+// Must checks if err is nil, otherwise logs the err and exits.
 func Must(err error) {
-	if err == nil {
-		return
+	if err != nil {
+		msg := formatWithCaller(err.Error(), 3)
+		log.Print(msg)
+		outputText(severeLog, levelFatal, msg)
+		os.Exit(1)
 	}
-
-	msg := err.Error()
-	log.Print(msg)
-	getWriter().Severe(msg)
-	os.Exit(1)
-}
-
-// MustSetup sets up logging with given config c. It exits on error.
-func MustSetup(c LogConf) {
-	Must(SetUp(c))
-}
-
-// Reset clears the writer and resets the log level.
-func Reset() Writer {
-	SetLevel(InfoLevel)
-	return writer.Swap(nil)
 }
 
 // SetLevel sets the logging level. It can be used to suppress some logs.
@@ -196,43 +273,6 @@ func SetLevel(level uint32) {
 	atomic.StoreUint32(&logLevel, level)
 }
 
-// SetWriter sets the logging writer. It can be used to customize the logging.
-// Call Reset before calling SetWriter again.
-func SetWriter(w Writer) {
-	if writer.Load() == nil {
-		writer.Store(w)
-	}
-}
-
-// SetUp sets up the logx. If already set up, just return nil.
-// we allow SetUp to be called multiple times, because for example
-// we need to allow different service frameworks to initialize logx respectively.
-// the same logic for SetUp
-func SetUp(c LogConf) error {
-	setupLogLevel(c)
-
-	if len(c.TimeFormat) > 0 {
-		timeFormat = c.TimeFormat
-	}
-
-	switch c.Encoding {
-	case plainEncoding:
-		atomic.StoreUint32(&encoding, plainEncodingType)
-	default:
-		atomic.StoreUint32(&encoding, jsonEncodingType)
-	}
-
-	switch c.Mode {
-	case fileMode:
-		return setupWithFiles(c)
-	case volumeMode:
-		return setupWithVolume(c)
-	default:
-		setupWithConsole()
-		return nil
-	}
-}
-
 // Severe writes v into severe log.
 func Severe(v ...interface{}) {
 	severeSync(fmt.Sprint(v...))
@@ -258,11 +298,6 @@ func Slowv(v interface{}) {
 	slowAnySync(v)
 }
 
-// Sloww writes msg along with fields into slow log.
-func Sloww(msg string, fields ...LogField) {
-	slowFieldsSync(msg, fields...)
-}
-
 // Stat writes v into stat log.
 func Stat(v ...interface{}) {
 	statSync(fmt.Sprint(v...))
@@ -305,30 +340,52 @@ func createOutput(path string) (io.WriteCloser, error) {
 
 func errorAnySync(v interface{}) {
 	if shallLog(ErrorLevel) {
-		getWriter().Error(v)
+		outputAny(errorLog, levelError, v)
 	}
 }
 
-func errorFieldsSync(content string, fields ...LogField) {
+func errorTextSync(msg string, callDepth int) {
 	if shallLog(ErrorLevel) {
-		getWriter().Error(content, fields...)
+		outputError(errorLog, msg, callDepth)
 	}
 }
 
-func errorTextSync(msg string) {
-	if shallLog(ErrorLevel) {
-		getWriter().Error(msg)
+func formatWithCaller(msg string, callDepth int) string {
+	var buf strings.Builder
+
+	caller := getCaller(callDepth)
+	if len(caller) > 0 {
+		buf.WriteString(caller)
+		buf.WriteByte(' ')
 	}
+
+	buf.WriteString(msg)
+
+	return buf.String()
 }
 
-func getWriter() Writer {
-	w := writer.Load()
-	if w == nil {
-		w = newConsoleWriter()
-		writer.Store(w)
+func getCaller(callDepth int) string {
+	var buf strings.Builder
+
+	_, file, line, ok := runtime.Caller(callDepth)
+	if ok {
+		short := file
+		for i := len(file) - 1; i > 0; i-- {
+			if file[i] == '/' {
+				short = file[i+1:]
+				break
+			}
+		}
+		buf.WriteString(short)
+		buf.WriteByte(':')
+		buf.WriteString(strconv.Itoa(line))
 	}
 
-	return w
+	return buf.String()
+}
+
+func getTimestamp() string {
+	return timex.Time().Format(timeFormat)
 }
 
 func handleOptions(opts []LogOption) {
@@ -339,19 +396,46 @@ func handleOptions(opts []LogOption) {
 
 func infoAnySync(val interface{}) {
 	if shallLog(InfoLevel) {
-		getWriter().Info(val)
-	}
-}
-
-func infoFieldsSync(content string, fields ...LogField) {
-	if shallLog(InfoLevel) {
-		getWriter().Info(content, fields...)
+		outputAny(infoLog, levelInfo, val)
 	}
 }
 
 func infoTextSync(msg string) {
 	if shallLog(InfoLevel) {
-		getWriter().Info(msg)
+		outputText(infoLog, levelInfo, msg)
+	}
+}
+
+func outputAny(writer io.Writer, level string, val interface{}) {
+	info := logEntry{
+		Timestamp: getTimestamp(),
+		Level:     level,
+		Content:   val,
+	}
+	outputJson(writer, info)
+}
+
+func outputText(writer io.Writer, level, msg string) {
+	info := logEntry{
+		Timestamp: getTimestamp(),
+		Level:     level,
+		Content:   msg,
+	}
+	outputJson(writer, info)
+}
+
+func outputError(writer io.Writer, msg string, callDepth int) {
+	content := formatWithCaller(msg, callDepth)
+	outputText(writer, levelError, content)
+}
+
+func outputJson(writer io.Writer, info interface{}) {
+	if content, err := json.Marshal(info); err != nil {
+		log.Println(err.Error())
+	} else if atomic.LoadUint32(&initialized) == 0 || writer == nil {
+		log.Println(string(content))
+	} else {
+		writer.Write(append(content, '\n'))
 	}
 }
 
@@ -366,18 +450,72 @@ func setupLogLevel(c LogConf) {
 	}
 }
 
-func setupWithConsole() {
-	SetWriter(newConsoleWriter())
+func setupWithConsole(c LogConf) {
+	once.Do(func() {
+		atomic.StoreUint32(&initialized, 1)
+		writeConsole = true
+		setupLogLevel(c)
+
+		infoLog = newLogWriter(log.New(os.Stdout, "", flags))
+		errorLog = newLogWriter(log.New(os.Stderr, "", flags))
+		severeLog = newLogWriter(log.New(os.Stderr, "", flags))
+		slowLog = newLogWriter(log.New(os.Stderr, "", flags))
+		stackLog = newLessWriter(errorLog, options.logStackCooldownMills)
+		statLog = infoLog
+	})
 }
 
 func setupWithFiles(c LogConf) error {
-	w, err := newFileWriter(c)
-	if err != nil {
-		return err
+	var opts []LogOption
+	var err error
+
+	if len(c.Path) == 0 {
+		return ErrLogPathNotSet
 	}
 
-	SetWriter(w)
-	return nil
+	opts = append(opts, WithCooldownMillis(c.StackCooldownMillis))
+	if c.Compress {
+		opts = append(opts, WithGzip())
+	}
+	if c.KeepDays > 0 {
+		opts = append(opts, WithKeepDays(c.KeepDays))
+	}
+
+	accessFile := path.Join(c.Path, accessFilename)
+	errorFile := path.Join(c.Path, errorFilename)
+	severeFile := path.Join(c.Path, severeFilename)
+	slowFile := path.Join(c.Path, slowFilename)
+	statFile := path.Join(c.Path, statFilename)
+
+	once.Do(func() {
+		atomic.StoreUint32(&initialized, 1)
+		handleOptions(opts)
+		setupLogLevel(c)
+
+		if infoLog, err = createOutput(accessFile); err != nil {
+			return
+		}
+
+		if errorLog, err = createOutput(errorFile); err != nil {
+			return
+		}
+
+		if severeLog, err = createOutput(severeFile); err != nil {
+			return
+		}
+
+		if slowLog, err = createOutput(slowFile); err != nil {
+			return
+		}
+
+		if statLog, err = createOutput(statFile); err != nil {
+			return
+		}
+
+		stackLog = newLessWriter(errorLog, options.logStackCooldownMills)
+	})
+
+	return err
 }
 
 func setupWithVolume(c LogConf) error {
@@ -391,7 +529,7 @@ func setupWithVolume(c LogConf) error {
 
 func severeSync(msg string) {
 	if shallLog(SevereLevel) {
-		getWriter().Severe(fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
+		outputText(severeLog, levelSevere, fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
 	}
 }
 
@@ -405,30 +543,43 @@ func shallLogStat() bool {
 
 func slowAnySync(v interface{}) {
 	if shallLog(ErrorLevel) {
-		getWriter().Slow(v)
-	}
-}
-
-func slowFieldsSync(content string, fields ...LogField) {
-	if shallLog(ErrorLevel) {
-		getWriter().Slow(content, fields...)
+		outputAny(slowLog, levelSlow, v)
 	}
 }
 
 func slowTextSync(msg string) {
 	if shallLog(ErrorLevel) {
-		getWriter().Slow(msg)
+		outputText(slowLog, levelSlow, msg)
 	}
 }
 
 func stackSync(msg string) {
 	if shallLog(ErrorLevel) {
-		getWriter().Stack(fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
+		outputText(stackLog, levelError, fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
 	}
 }
 
 func statSync(msg string) {
 	if shallLogStat() && shallLog(InfoLevel) {
-		getWriter().Stat(msg)
+		outputText(statLog, levelStat, msg)
 	}
 }
+
+type logWriter struct {
+	logger *log.Logger
+}
+
+func newLogWriter(logger *log.Logger) logWriter {
+	return logWriter{
+		logger: logger,
+	}
+}
+
+func (lw logWriter) Close() error {
+	return nil
+}
+
+func (lw logWriter) Write(data []byte) (int, error) {
+	lw.logger.Print(string(data))
+	return len(data), nil
+}

core/logx/logs_test.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
 	"os"
-	"reflect"
 	"runtime"
 	"strings"
 	"sync"
@@ -19,9 +19,8 @@ import (
 )
 
 var (
-	s           = []byte("Sending #11 notification (id: 1451875113812010473) in #1 connection")
-	pool        = make(chan []byte, 1)
-	_    Writer = (*mockWriter)(nil)
+	s    = []byte("Sending #11 notification (id: 1451875113812010473) in #1 connection")
+	pool = make(chan []byte, 1)
 )
 
 type mockWriter struct {
@@ -29,46 +28,10 @@ type mockWriter struct {
 	builder strings.Builder
 }
 
-func (mw *mockWriter) Alert(v interface{}) {
+func (mw *mockWriter) Write(data []byte) (int, error) {
 	mw.lock.Lock()
 	defer mw.lock.Unlock()
-	output(&mw.builder, levelAlert, v)
-}
-
-func (mw *mockWriter) Error(v interface{}, fields ...LogField) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelError, v, fields...)
-}
-
-func (mw *mockWriter) Info(v interface{}, fields ...LogField) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelInfo, v, fields...)
-}
-
-func (mw *mockWriter) Severe(v interface{}) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelSevere, v)
-}
-
-func (mw *mockWriter) Slow(v interface{}, fields ...LogField) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelSlow, v, fields...)
-}
-
-func (mw *mockWriter) Stack(v interface{}) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelError, v)
-}
-
-func (mw *mockWriter) Stat(v interface{}, fields ...LogField) {
-	mw.lock.Lock()
-	defer mw.lock.Unlock()
-	output(&mw.builder, levelStat, v, fields...)
+	return mw.builder.Write(data)
 }
 
 func (mw *mockWriter) Close() error {
@@ -93,376 +56,155 @@ func (mw *mockWriter) String() string {
 	return mw.builder.String()
 }
 
-func TestField(t *testing.T) {
-	tests := []struct {
-		name string
-		f    LogField
-		want map[string]interface{}
-	}{
-		{
-			name: "error",
-			f:    Field("foo", errors.New("bar")),
-			want: map[string]interface{}{
-				"foo": "bar",
-			},
-		},
-		{
-			name: "errors",
-			f:    Field("foo", []error{errors.New("bar"), errors.New("baz")}),
-			want: map[string]interface{}{
-				"foo": []interface{}{"bar", "baz"},
-			},
-		},
-		{
-			name: "strings",
-			f:    Field("foo", []string{"bar", "baz"}),
-			want: map[string]interface{}{
-				"foo": []interface{}{"bar", "baz"},
-			},
-		},
-		{
-			name: "duration",
-			f:    Field("foo", time.Second),
-			want: map[string]interface{}{
-				"foo": "1s",
-			},
-		},
-		{
-			name: "durations",
-			f:    Field("foo", []time.Duration{time.Second, 2 * time.Second}),
-			want: map[string]interface{}{
-				"foo": []interface{}{"1s", "2s"},
-			},
-		},
-		{
-			name: "times",
-			f: Field("foo", []time.Time{
-				time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC),
-				time.Date(2020, time.January, 2, 0, 0, 0, 0, time.UTC),
-			}),
-			want: map[string]interface{}{
-				"foo": []interface{}{"2020-01-01 00:00:00 +0000 UTC", "2020-01-02 00:00:00 +0000 UTC"},
-			},
-		},
-		{
-			name: "stringer",
-			f:    Field("foo", ValStringer{val: "bar"}),
-			want: map[string]interface{}{
-				"foo": "bar",
-			},
-		},
-		{
-			name: "stringers",
-			f:    Field("foo", []fmt.Stringer{ValStringer{val: "bar"}, ValStringer{val: "baz"}}),
-			want: map[string]interface{}{
-				"foo": []interface{}{"bar", "baz"},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.name, func(t *testing.T) {
-			w := new(mockWriter)
-			old := writer.Swap(w)
-			defer writer.Store(old)
-
-			Infow("foo", test.f)
-			validateFields(t, w.String(), test.want)
-		})
-	}
-}
-
 func TestFileLineFileMode(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	errorLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	file, line := getFileLine()
 	Error("anything")
-	assert.True(t, w.Contains(fmt.Sprintf("%s:%d", file, line+1)))
+	assert.True(t, writer.Contains(fmt.Sprintf("%s:%d", file, line+1)))
 
+	writer.Reset()
 	file, line = getFileLine()
 	Errorf("anything %s", "format")
-	assert.True(t, w.Contains(fmt.Sprintf("%s:%d", file, line+1)))
+	assert.True(t, writer.Contains(fmt.Sprintf("%s:%d", file, line+1)))
 }
 
 func TestFileLineConsoleMode(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	writeConsole = true
+	errorLog = newLogWriter(log.New(writer, "[ERROR] ", flags))
+	atomic.StoreUint32(&initialized, 1)
 	file, line := getFileLine()
 	Error("anything")
-	assert.True(t, w.Contains(fmt.Sprintf("%s:%d", file, line+1)))
+	assert.True(t, writer.Contains(fmt.Sprintf("%s:%d", file, line+1)))
 
-	w.Reset()
+	writer.Reset()
 	file, line = getFileLine()
 	Errorf("anything %s", "format")
-	assert.True(t, w.Contains(fmt.Sprintf("%s:%d", file, line+1)))
+	assert.True(t, writer.Contains(fmt.Sprintf("%s:%d", file, line+1)))
 }
 
 func TestStructedLogAlert(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelAlert, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelAlert, func(writer io.WriteCloser) {
+		errorLog = writer
+	}, func(v ...interface{}) {
 		Alert(fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogError(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelError, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelError, func(writer io.WriteCloser) {
+		errorLog = writer
+	}, func(v ...interface{}) {
 		Error(v...)
 	})
 }
 
 func TestStructedLogErrorf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelError, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelError, func(writer io.WriteCloser) {
+		errorLog = writer
+	}, func(v ...interface{}) {
 		Errorf("%s", fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogErrorv(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelError, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelError, func(writer io.WriteCloser) {
+		errorLog = writer
+	}, func(v ...interface{}) {
 		Errorv(fmt.Sprint(v...))
 	})
 }
 
-func TestStructedLogErrorw(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelError, w, func(v ...interface{}) {
-		Errorw(fmt.Sprint(v...), Field("foo", "bar"))
-	})
-}
-
 func TestStructedLogInfo(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelInfo, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelInfo, func(writer io.WriteCloser) {
+		infoLog = writer
+	}, func(v ...interface{}) {
 		Info(v...)
 	})
 }
 
 func TestStructedLogInfof(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelInfo, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelInfo, func(writer io.WriteCloser) {
+		infoLog = writer
+	}, func(v ...interface{}) {
 		Infof("%s", fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogInfov(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelInfo, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelInfo, func(writer io.WriteCloser) {
+		infoLog = writer
+	}, func(v ...interface{}) {
 		Infov(fmt.Sprint(v...))
 	})
 }
 
-func TestStructedLogInfow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelInfo, w, func(v ...interface{}) {
-		Infow(fmt.Sprint(v...), Field("foo", "bar"))
-	})
-}
-
-func TestStructedLogInfoConsoleAny(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLogConsole(t, w, func(v ...interface{}) {
-		old := atomic.LoadUint32(&encoding)
-		atomic.StoreUint32(&encoding, plainEncodingType)
-		defer func() {
-			atomic.StoreUint32(&encoding, old)
-		}()
-
-		Infov(v)
-	})
-}
-
-func TestStructedLogInfoConsoleAnyString(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLogConsole(t, w, func(v ...interface{}) {
-		old := atomic.LoadUint32(&encoding)
-		atomic.StoreUint32(&encoding, plainEncodingType)
-		defer func() {
-			atomic.StoreUint32(&encoding, old)
-		}()
-
-		Infov(fmt.Sprint(v...))
-	})
-}
-
-func TestStructedLogInfoConsoleAnyError(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLogConsole(t, w, func(v ...interface{}) {
-		old := atomic.LoadUint32(&encoding)
-		atomic.StoreUint32(&encoding, plainEncodingType)
-		defer func() {
-			atomic.StoreUint32(&encoding, old)
-		}()
-
-		Infov(errors.New(fmt.Sprint(v...)))
-	})
-}
-
-func TestStructedLogInfoConsoleAnyStringer(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLogConsole(t, w, func(v ...interface{}) {
-		old := atomic.LoadUint32(&encoding)
-		atomic.StoreUint32(&encoding, plainEncodingType)
-		defer func() {
-			atomic.StoreUint32(&encoding, old)
-		}()
-
-		Infov(ValStringer{
-			val: fmt.Sprint(v...),
-		})
-	})
-}
-
-func TestStructedLogInfoConsoleText(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLogConsole(t, w, func(v ...interface{}) {
-		old := atomic.LoadUint32(&encoding)
-		atomic.StoreUint32(&encoding, plainEncodingType)
-		defer func() {
-			atomic.StoreUint32(&encoding, old)
-		}()
-
-		Info(fmt.Sprint(v...))
-	})
-}
-
 func TestStructedLogSlow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSlow, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelSlow, func(writer io.WriteCloser) {
+		slowLog = writer
+	}, func(v ...interface{}) {
 		Slow(v...)
 	})
 }
 
 func TestStructedLogSlowf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSlow, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelSlow, func(writer io.WriteCloser) {
+		slowLog = writer
+	}, func(v ...interface{}) {
 		Slowf(fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogSlowv(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSlow, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelSlow, func(writer io.WriteCloser) {
+		slowLog = writer
+	}, func(v ...interface{}) {
 		Slowv(fmt.Sprint(v...))
 	})
 }
 
-func TestStructedLogSloww(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSlow, w, func(v ...interface{}) {
-		Sloww(fmt.Sprint(v...), Field("foo", time.Second))
-	})
-}
-
 func TestStructedLogStat(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelStat, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelStat, func(writer io.WriteCloser) {
+		statLog = writer
+	}, func(v ...interface{}) {
 		Stat(v...)
 	})
 }
 
 func TestStructedLogStatf(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelStat, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelStat, func(writer io.WriteCloser) {
+		statLog = writer
+	}, func(v ...interface{}) {
 		Statf(fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogSevere(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSevere, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelSevere, func(writer io.WriteCloser) {
+		severeLog = writer
+	}, func(v ...interface{}) {
 		Severe(v...)
 	})
 }
 
 func TestStructedLogSeveref(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
-	doTestStructedLog(t, levelSevere, w, func(v ...interface{}) {
+	doTestStructedLog(t, levelSevere, func(writer io.WriteCloser) {
+		severeLog = writer
+	}, func(v ...interface{}) {
 		Severef(fmt.Sprint(v...))
 	})
 }
 
 func TestStructedLogWithDuration(t *testing.T) {
 	const message = "hello there"
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	infoLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	WithDuration(time.Second).Info(message)
 	var entry logEntry
-	if err := json.Unmarshal([]byte(w.String()), &entry); err != nil {
+	if err := json.Unmarshal([]byte(writer.builder.String()), &entry); err != nil {
 		t.Error(err)
 	}
 	assert.Equal(t, levelInfo, entry.Level)
@@ -473,12 +215,11 @@ func TestStructedLogWithDuration(t *testing.T) {
 func TestSetLevel(t *testing.T) {
 	SetLevel(ErrorLevel)
 	const message = "hello there"
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	infoLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	Info(message)
-	assert.Equal(t, 0, w.builder.Len())
+	assert.Equal(t, 0, writer.builder.Len())
 }
 
 func TestSetLevelTwiceWithMode(t *testing.T) {
@@ -487,35 +228,29 @@ func TestSetLevelTwiceWithMode(t *testing.T) {
 		"console",
 		"volumn",
 	}
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
 	for _, mode := range testModes {
-		testSetLevelTwiceWithMode(t, mode, w)
+		testSetLevelTwiceWithMode(t, mode)
 	}
 }
 
 func TestSetLevelWithDuration(t *testing.T) {
 	SetLevel(ErrorLevel)
 	const message = "hello there"
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	infoLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	WithDuration(time.Second).Info(message)
-	assert.Equal(t, 0, w.builder.Len())
+	assert.Equal(t, 0, writer.builder.Len())
 }
 
 func TestErrorfWithWrappedError(t *testing.T) {
 	SetLevel(ErrorLevel)
 	const message = "there"
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
-
+	writer := new(mockWriter)
+	errorLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	Errorf("hello %w", errors.New(message))
-	assert.True(t, strings.Contains(w.String(), "hello there"))
+	assert.True(t, strings.Contains(writer.builder.String(), "hello there"))
 }
 
 func TestMustNil(t *testing.T) {
@@ -523,11 +258,6 @@ func TestMustNil(t *testing.T) {
 }
 
 func TestSetup(t *testing.T) {
-	defer func() {
-		SetLevel(InfoLevel)
-		atomic.StoreUint32(&encoding, jsonEncodingType)
-	}()
-
 	MustSetup(LogConf{
 		ServiceName: "any",
 		Mode:        "console",
@@ -542,17 +272,6 @@ func TestSetup(t *testing.T) {
 		Mode:        "volume",
 		Path:        os.TempDir(),
 	})
-	MustSetup(LogConf{
-		ServiceName: "any",
-		Mode:        "console",
-		TimeFormat:  timeFormat,
-	})
-	MustSetup(LogConf{
-		ServiceName: "any",
-		Mode:        "console",
-		Encoding:    plainEncoding,
-	})
-
 	assert.NotNil(t, setupWithVolume(LogConf{}))
 	assert.NotNil(t, setupWithFiles(LogConf{}))
 	assert.Nil(t, setupWithFiles(LogConf{
@@ -573,8 +292,6 @@ func TestSetup(t *testing.T) {
 	_, err := createOutput("")
 	assert.NotNil(t, err)
 	Disable()
-	SetLevel(InfoLevel)
-	atomic.StoreUint32(&encoding, jsonEncodingType)
 }
 
 func TestDisable(t *testing.T) {
@@ -584,6 +301,7 @@ func TestDisable(t *testing.T) {
 	WithKeepDays(1)(&opt)
 	WithGzip()(&opt)
 	assert.Nil(t, Close())
+	writeConsole = false
 	assert.Nil(t, Close())
 }
 
@@ -591,20 +309,11 @@ func TestDisableStat(t *testing.T) {
 	DisableStat()
 
 	const message = "hello there"
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
+	writer := new(mockWriter)
+	statLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	Stat(message)
-	assert.Equal(t, 0, w.builder.Len())
-}
-
-func TestSetWriter(t *testing.T) {
-	Reset()
-	SetWriter(nopWriter{})
-	assert.NotNil(t, writer.Load())
-	assert.True(t, writer.Load() == nopWriter{})
-	SetWriter(new(mockWriter))
-	assert.True(t, writer.Load() == nopWriter{})
+	assert.Equal(t, 0, writer.builder.Len())
 }
 
 func TestWithGzip(t *testing.T) {
@@ -706,11 +415,15 @@ func put(b []byte) {
 	}
 }
 
-func doTestStructedLog(t *testing.T, level string, w *mockWriter, write func(...interface{})) {
+func doTestStructedLog(t *testing.T, level string, setup func(writer io.WriteCloser),
+	write func(...interface{})) {
 	const message = "hello there"
+	writer := new(mockWriter)
+	setup(writer)
+	atomic.StoreUint32(&initialized, 1)
 	write(message)
 	var entry logEntry
-	if err := json.Unmarshal([]byte(w.String()), &entry); err != nil {
+	if err := json.Unmarshal([]byte(writer.builder.String()), &entry); err != nil {
 		t.Error(err)
 	}
 	assert.Equal(t, level, entry.Level)
@@ -719,14 +432,7 @@ func doTestStructedLog(t *testing.T, level string, w *mockWriter, write func(...
 	assert.True(t, strings.Contains(val, message))
 }
 
-func doTestStructedLogConsole(t *testing.T, w *mockWriter, write func(...interface{})) {
-	const message = "hello there"
-	write(message)
-	assert.True(t, strings.Contains(w.String(), message))
-}
-
-func testSetLevelTwiceWithMode(t *testing.T, mode string, w *mockWriter) {
-	writer.Store(nil)
+func testSetLevelTwiceWithMode(t *testing.T, mode string) {
 	SetUp(LogConf{
 		Mode:  mode,
 		Level: "error",
@@ -738,35 +444,15 @@ func testSetLevelTwiceWithMode(t *testing.T, mode string, w *mockWriter) {
 		Path:  "/dev/null",
 	})
 	const message = "hello there"
+	writer := new(mockWriter)
+	infoLog = writer
+	atomic.StoreUint32(&initialized, 1)
 	Info(message)
-	assert.Equal(t, 0, w.builder.Len())
+	assert.Equal(t, 0, writer.builder.Len())
 	Infof(message)
-	assert.Equal(t, 0, w.builder.Len())
+	assert.Equal(t, 0, writer.builder.Len())
 	ErrorStack(message)
-	assert.Equal(t, 0, w.builder.Len())
+	assert.Equal(t, 0, writer.builder.Len())
 	ErrorStackf(message)
-	assert.Equal(t, 0, w.builder.Len())
-}
-
-type ValStringer struct {
-	val string
-}
-
-func (v ValStringer) String() string {
-	return v.val
-}
-
-func validateFields(t *testing.T, content string, fields map[string]interface{}) {
-	var m map[string]interface{}
-	if err := json.Unmarshal([]byte(content), &m); err != nil {
-		t.Error(err)
-	}
-
-	for k, v := range fields {
-		if reflect.TypeOf(v).Kind() == reflect.Slice {
-			assert.EqualValues(t, v, m[k])
-		} else {
-			assert.Equal(t, v, m[k], content)
-		}
-	}
+	assert.Equal(t, 0, writer.builder.Len())
 }

core/logx/logwriter.go

@@ -1,22 +0,0 @@
-package logx
-
-import "log"
-
-type logWriter struct {
-	logger *log.Logger
-}
-
-func newLogWriter(logger *log.Logger) logWriter {
-	return logWriter{
-		logger: logger,
-	}
-}
-
-func (lw logWriter) Close() error {
-	return nil
-}
-
-func (lw logWriter) Write(data []byte) (int, error) {
-	lw.logger.Print(string(data))
-	return len(data), nil
-}

core/logx/readme-cn.md

@@ -1,197 +0,0 @@
-<IMG align="right" width="150px" src="https://raw.githubusercontent.com/zeromicro/zero-doc/main/doc/images/go-zero.png">
-
-# logx
-
-[English](readme.md) | 简体中文
-
-## logx 配置
-
-```go
-type LogConf struct {
-	ServiceName         string `json:",optional"`
-	Mode                string `json:",default=console,options=[console,file,volume]"`
-	Encoding            string `json:",default=json,options=[json,plain]"`
-	TimeFormat          string `json:",optional"`
-	Path                string `json:",default=logs"`
-	Level               string `json:",default=info,options=[info,error,severe]"`
-	Compress            bool   `json:",optional"`
-	KeepDays            int    `json:",optional"`
-	StackCooldownMillis int    `json:",default=100"`
-}
-```
-
-- `ServiceName`：设置服务名称，可选。在 `volume` 模式下，该名称用于生成日志文件。在 `rest/zrpc` 服务中，名称将被自动设置为 `rest`或`zrpc` 的名称。
-- `Mode`：输出日志的模式，默认是 `console`
-  - `console` 模式将日志写到 `stdout/stderr`
-  - `file` 模式将日志写到 `Path` 指定目录的文件中
-  - `volume` 模式在 docker 中使用，将日志写入挂载的卷中
-- `Encoding`: 指示如何对日志进行编码，默认是 `json`
-  - `json`模式以 json 格式写日志
-  - `plain`模式用纯文本写日志，并带有终端颜色显示
-- `TimeFormat`：自定义时间格式，可选。默认是 `2006-01-02T15:04:05.000Z07:00`
-- `Path`：设置日志路径，默认为 `logs`
-- `Level`: 用于过滤日志的日志级别。默认为 `info`
-  - `info`，所有日志都被写入
-  - `error`, `info` 的日志被丢弃
-  - `severe`, `info` 和 `error` 日志被丢弃，只有 `severe` 日志被写入
-- `Compress`: 是否压缩日志文件，只在 `file` 模式下工作
-- `KeepDays`：日志文件被保留多少天，在给定的天数之后，过期的文件将被自动删除。对 `console` 模式没有影响
-- `StackCooldownMillis`：多少毫秒后再次写入堆栈跟踪。用来避免堆栈跟踪日志过多
-
-## 打印日志方法
-
-```go
-type Logger interface {
-	// Error logs a message at error level.
-	Error(...interface{})
-	// Errorf logs a message at error level.
-	Errorf(string, ...interface{})
-	// Errorv logs a message at error level.
-	Errorv(interface{})
-	// Errorw logs a message at error level.
-	Errorw(string, ...LogField)
-	// Info logs a message at info level.
-	Info(...interface{})
-	// Infof logs a message at info level.
-	Infof(string, ...interface{})
-	// Infov logs a message at info level.
-	Infov(interface{})
-	// Infow logs a message at info level.
-	Infow(string, ...LogField)
-	// Slow logs a message at slow level.
-	Slow(...interface{})
-	// Slowf logs a message at slow level.
-	Slowf(string, ...interface{})
-	// Slowv logs a message at slow level.
-	Slowv(interface{})
-	// Sloww logs a message at slow level.
-	Sloww(string, ...LogField)
-	// WithContext returns a new logger with the given context.
-	WithContext(context.Context) Logger
-	// WithDuration returns a new logger with the given duration.
-	WithDuration(time.Duration) Logger
-}
-```
-
-- `Error`, `Info`, `Slow`: 将任何类型的信息写进日志，使用 `fmt.Sprint(...)` 来转换为 `string`
-- `Errorf`, `Infof`, `Slowf`: 将指定格式的信息写入日志
-- `Errorv`, `Infov`, `Slowv`: 将任何类型的信息写入日志，用 `json marshal` 编码
-- `Errorw`, `Infow`, `Sloww`: 写日志，并带上给定的 `key:value` 字段
-- `WithContext`：将给定的 ctx 注入日志信息，例如用于记录 `trace-id`和`span-id`
-- `WithDuration`: 将指定的时间写入日志信息中，字段名为 `duration`
-
-## 与第三方日志库集成
-
-- zap
-  - 实现：[https://github.com/zeromicro/zero-contrib/blob/main/logx/zapx/zap.go](https://github.com/zeromicro/zero-contrib/blob/main/logx/zapx/zap.go)
-  - 使用示例：[https://github.com/zeromicro/zero-examples/blob/main/logx/zaplog/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/zaplog/main.go)
-- logrus
-  - 实现：[https://github.com/zeromicro/zero-contrib/blob/main/logx/logrusx/logrus.go](https://github.com/zeromicro/zero-contrib/blob/main/logx/logrusx/logrus.go)
-  - 使用示例：[https://github.com/zeromicro/zero-examples/blob/main/logx/logrus/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/logrus/main.go)
-
-对于其它的日志库，请参考上面示例实现，并欢迎提交 `PR` 到 [https://github.com/zeromicro/zero-contrib](https://github.com/zeromicro/zero-contrib)
-
-## 将日志写到指定的存储
-
-`logx`定义了两个接口，方便自定义 `logx`，将日志写入任何存储。
-
-- `logx.NewWriter(w io.Writer)`
-- `logx.SetWriter(write logx.Writer)`
-
-例如，如果我们想把日志写进kafka，而不是控制台或文件，我们可以像下面这样做。
-
-```go
-type KafkaWriter struct {
-	Pusher *kq.Pusher
-}
-
-func NewKafkaWriter(pusher *kq.Pusher) *KafkaWriter {
-	return &KafkaWriter{
-		Pusher: pusher,
-	}
-}
-
-func (w *KafkaWriter) Write(p []byte) (n int, err error) {
-	// writing log with newlines, trim them.
-	if err := w.Pusher.Push(strings.TrimSpace(string(p))); err != nil {
-		return 0, err
-	}
-
-	return len(p), nil
-}
-
-func main() {
-	pusher := kq.NewPusher([]string{"localhost:9092"}, "go-zero")
-	defer pusher.Close()
-
-	writer := logx.NewWriter(NewKafkaWriter(pusher))
-	logx.SetWriter(writer)
-  
-	// more code
-}
-```
-
-完整代码：[https://github.com/zeromicro/zero-examples/blob/main/logx/tokafka/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/tokafka/main.go)
-
-## 过滤敏感字段
-
-如果我们需要防止  `password` 字段被记录下来，我们可以像下面这样实现。
-
-```go
-type (
-	Message struct {
-		Name     string
-		Password string
-		Message  string
-	}
-
-	SensitiveLogger struct {
-		logx.Writer
-	}
-)
-
-func NewSensitiveLogger(writer logx.Writer) *SensitiveLogger {
-	return &SensitiveLogger{
-		Writer: writer,
-	}
-}
-
-func (l *SensitiveLogger) Info(msg interface{}, fields ...logx.LogField) {
-	if m, ok := msg.(Message); ok {
-		l.Writer.Info(Message{
-			Name:     m.Name,
-			Password: "******",
-			Message:  m.Message,
-		}, fields...)
-	} else {
-		l.Writer.Info(msg, fields...)
-	}
-}
-
-func main() {
-	// setup logx to make sure originalWriter not nil,
-	// the injected writer is only for filtering, like a middleware.
-
-	originalWriter := logx.Reset()
-	writer := NewSensitiveLogger(originalWriter)
-	logx.SetWriter(writer)
-
-	logx.Infov(Message{
-		Name:     "foo",
-		Password: "shouldNotAppear",
-		Message:  "bar",
-	})
-  
-	// more code
-}
-```
-
-完整代码：[https://github.com/zeromicro/zero-examples/blob/main/logx/filterfields/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/filterfields/main.go)
-
-## 更多示例
-
-[https://github.com/zeromicro/zero-examples/tree/main/logx](https://github.com/zeromicro/zero-examples/tree/main/logx)
-
-## Give a Star! ⭐
-
-如果你正在使用或者觉得这个项目对你有帮助，请 **star** 支持，感谢！

core/logx/readme.md

@@ -1,197 +0,0 @@
-<img align="right" width="150px" src="https://raw.githubusercontent.com/zeromicro/zero-doc/main/doc/images/go-zero.png">
-
-# logx
-
-English | [简体中文](readme-cn.md)
-
-## logx configurations
-
-```go
-type LogConf struct {
-	ServiceName         string `json:",optional"`
-	Mode                string `json:",default=console,options=[console,file,volume]"`
-	Encoding            string `json:",default=json,options=[json,plain]"`
-	TimeFormat          string `json:",optional"`
-	Path                string `json:",default=logs"`
-	Level               string `json:",default=info,options=[info,error,severe]"`
-	Compress            bool   `json:",optional"`
-	KeepDays            int    `json:",optional"`
-	StackCooldownMillis int    `json:",default=100"`
-}
-```
-
-- `ServiceName`: set the service name, optional. on `volume` mode, the name is used to generate the log files. Within `rest/zrpc` services, the name will be set to the name of `rest` or `zrpc` automatically.
-- `Mode`: the mode to output the logs, default is `console`.
-  -  `console` mode writes the logs to `stdout/stderr`.
-  - `file` mode writes the logs to the files specified by `Path`.
-  - `volume` mode is used in docker, to write logs into mounted volumes.
-- `Encoding`: indicates how to encode the logs, default is `json`.
-  - `json` mode writes the logs in json format.
-  - `plain` mode writes the logs with plain text, with terminal color enabled.
-- `TimeFormat`: customize the time format, optional. Default is `2006-01-02T15:04:05.000Z07:00`.
-- `Path`: set the log path, default to `logs`.
-- `Level`: the logging level to filter logs. Default is `info`.
-  - `info`, all logs are written.
-  - `error`, `info` logs are suppressed.
-  - `severe`, `info` and `error` logs are suppressed, only `severe` logs are written.
-- `Compress`: whether or not to compress log files, only works with `file` mode.
-- `KeepDays`: how many days that the log files are kept, after the given days, the outdated files will be deleted automatically. It has no effect on `console` mode.
-- `StackCooldownMillis`: how many milliseconds to rewrite stacktrace again. It’s used to avoid stacktrace flooding.
-
-## Logging methods
-
-```go
-type Logger interface {
-	// Error logs a message at error level.
-	Error(...interface{})
-	// Errorf logs a message at error level.
-	Errorf(string, ...interface{})
-	// Errorv logs a message at error level.
-	Errorv(interface{})
-	// Errorw logs a message at error level.
-	Errorw(string, ...LogField)
-	// Info logs a message at info level.
-	Info(...interface{})
-	// Infof logs a message at info level.
-	Infof(string, ...interface{})
-	// Infov logs a message at info level.
-	Infov(interface{})
-	// Infow logs a message at info level.
-	Infow(string, ...LogField)
-	// Slow logs a message at slow level.
-	Slow(...interface{})
-	// Slowf logs a message at slow level.
-	Slowf(string, ...interface{})
-	// Slowv logs a message at slow level.
-	Slowv(interface{})
-	// Sloww logs a message at slow level.
-	Sloww(string, ...LogField)
-	// WithContext returns a new logger with the given context.
-	WithContext(context.Context) Logger
-	// WithDuration returns a new logger with the given duration.
-	WithDuration(time.Duration) Logger
-}
-```
-
-- `Error`, `Info`, `Slow`: write any kind of messages into logs, with like `fmt.Sprint(…)`.
-- `Errorf`, `Infof`, `Slowf`: write messages with given format into logs.
-- `Errorv`, `Infov`, `Slowv`: write any kind of messages into logs, with json marshalling to encode them.
-- `Errorw`, `Infow`, `Sloww`: write the string message with given `key:value` fields.
-- `WithContext`: inject the given ctx into the log messages, typically used to log `trace-id` and `span-id`.
-- `WithDuration`: write elapsed duration into the log messages, with key `duration`.
-
-## Integrating with third-party logging libs
-
-- zap
-  - implementation: [https://github.com/zeromicro/zero-contrib/blob/main/logx/zapx/zap.go](https://github.com/zeromicro/zero-contrib/blob/main/logx/zapx/zap.go)
-  - usage example: [https://github.com/zeromicro/zero-examples/blob/main/logx/zaplog/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/zaplog/main.go)
-- logrus
-  - implementation: [https://github.com/zeromicro/zero-contrib/blob/main/logx/logrusx/logrus.go](https://github.com/zeromicro/zero-contrib/blob/main/logx/logrusx/logrus.go)
-  - usage example: [https://github.com/zeromicro/zero-examples/blob/main/logx/logrus/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/logrus/main.go)
-
-For more libs, please implement and PR to [https://github.com/zeromicro/zero-contrib](https://github.com/zeromicro/zero-contrib)
-
-## Write the logs to specific stores
-
-`logx` defined two interfaces to let you customize `logx` to write logs into any stores.
-
-- `logx.NewWriter(w io.Writer)`
-- `logx.SetWriter(writer logx.Writer)`
-
-For example, if we want to write the logs into kafka instead of console or files, we can do it like below:
-
-```go
-type KafkaWriter struct {
-	Pusher *kq.Pusher
-}
-
-func NewKafkaWriter(pusher *kq.Pusher) *KafkaWriter {
-	return &KafkaWriter{
-		Pusher: pusher,
-	}
-}
-
-func (w *KafkaWriter) Write(p []byte) (n int, err error) {
-	// writing log with newlines, trim them.
-	if err := w.Pusher.Push(strings.TrimSpace(string(p))); err != nil {
-		return 0, err
-	}
-
-	return len(p), nil
-}
-
-func main() {
-	pusher := kq.NewPusher([]string{"localhost:9092"}, "go-zero")
-	defer pusher.Close()
-
-	writer := logx.NewWriter(NewKafkaWriter(pusher))
-	logx.SetWriter(writer)
-  
-	// more code
-}
-```
-
-Complete code: [https://github.com/zeromicro/zero-examples/blob/main/logx/tokafka/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/tokafka/main.go)
-
-## Filtering sensitive fields
-
-If we need to prevent the `password` fields from logging, we can do it like below:
-
-```go
-type (
-	Message struct {
-		Name     string
-		Password string
-		Message  string
-	}
-
-	SensitiveLogger struct {
-		logx.Writer
-	}
-)
-
-func NewSensitiveLogger(writer logx.Writer) *SensitiveLogger {
-	return &SensitiveLogger{
-		Writer: writer,
-	}
-}
-
-func (l *SensitiveLogger) Info(msg interface{}, fields ...logx.LogField) {
-	if m, ok := msg.(Message); ok {
-		l.Writer.Info(Message{
-			Name:     m.Name,
-			Password: "******",
-			Message:  m.Message,
-		}, fields...)
-	} else {
-		l.Writer.Info(msg, fields...)
-	}
-}
-
-func main() {
-	// setup logx to make sure originalWriter not nil,
-	// the injected writer is only for filtering, like a middleware.
-
-	originalWriter := logx.Reset()
-	writer := NewSensitiveLogger(originalWriter)
-	logx.SetWriter(writer)
-
-	logx.Infov(Message{
-		Name:     "foo",
-		Password: "shouldNotAppear",
-		Message:  "bar",
-	})
-  
-	// more code
-}
-```
-
-Complete code: [https://github.com/zeromicro/zero-examples/blob/main/logx/filterfields/main.go](https://github.com/zeromicro/zero-examples/blob/main/logx/filterfields/main.go)
-
-## More examples
-
-[https://github.com/zeromicro/zero-examples/tree/main/logx](https://github.com/zeromicro/zero-examples/tree/main/logx)
-
-## Give a Star! ⭐
-
-If you like or are using this project to learn or start your solution, please give it a star. Thanks!

core/logx/rotatelogger.go

@@ -13,8 +13,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/fs"
-	"github.com/zeromicro/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/lang"
+	"github.com/tal-tech/go-zero/core/timex"
 )
 
 const (
@@ -210,12 +211,6 @@ func (l *RotateLogger) maybeCompressFile(file string) {
 			ErrorStack(r)
 		}
 	}()
-
-	if _, err := os.Stat(file); err != nil {
-		// file not exists or other error, ignore compression
-		return
-	}
-
 	compressLogFile(file)
 }
 
@@ -295,12 +290,12 @@ func (l *RotateLogger) write(v []byte) {
 }
 
 func compressLogFile(file string) {
-	start := time.Now()
+	start := timex.Now()
 	Infof("compressing log file: %s", file)
 	if err := gzipFile(file); err != nil {
 		Errorf("compress error: %s", err)
 	} else {
-		Infof("compressed log file: %s, took %s", file, time.Since(start))
+		Infof("compressed log file: %s, took %s", file, timex.Since(start))
 	}
 }
 

core/logx/rotatelogger_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zeromicro/go-zero/core/fs"
+	"github.com/tal-tech/go-zero/core/fs"
 )
 
 func TestDailyRotateRuleMarkRotated(t *testing.T) {
@@ -57,12 +57,6 @@ func TestRotateLoggerGetBackupFilename(t *testing.T) {
 }
 
 func TestRotateLoggerMayCompressFile(t *testing.T) {
-	old := os.Stdout
-	os.Stdout = os.NewFile(0, os.DevNull)
-	defer func() {
-		os.Stdout = old
-	}()
-
 	filename, err := fs.TempFilenameWithText("foo")
 	assert.Nil(t, err)
 	if len(filename) > 0 {
@@ -76,18 +70,15 @@ func TestRotateLoggerMayCompressFile(t *testing.T) {
 }
 
 func TestRotateLoggerMayCompressFileTrue(t *testing.T) {
-	old := os.Stdout
-	os.Stdout = os.NewFile(0, os.DevNull)
-	defer func() {
-		os.Stdout = old
-	}()
-
 	filename, err := fs.TempFilenameWithText("foo")
 	assert.Nil(t, err)
 	logger, err := NewLogger(filename, new(DailyRotateRule), true)
 	assert.Nil(t, err)
 	if len(filename) > 0 {
-		defer os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
+		defer func() {
+			os.Remove(filename)
+			os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
+		}()
 	}
 	logger.maybeCompressFile(filename)
 	_, err = os.Stat(filename)
@@ -101,6 +92,7 @@ func TestRotateLoggerRotate(t *testing.T) {
 	assert.Nil(t, err)
 	if len(filename) > 0 {
 		defer func() {
+			os.Remove(filename)
 			os.Remove(logger.getBackupFilename())
 			os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
 		}()
@@ -110,10 +102,6 @@ func TestRotateLoggerRotate(t *testing.T) {
 	case *os.LinkError:
 		// avoid rename error on docker container
 		assert.Equal(t, syscall.EXDEV, v.Err)
-	case *os.PathError:
-		// ignore remove error for tests,
-		// files are cleaned in GitHub actions.
-		assert.Equal(t, "remove", v.Op)
 	default:
 		assert.Nil(t, err)
 	}
@@ -127,18 +115,12 @@ func TestRotateLoggerWrite(t *testing.T) {
 	assert.Nil(t, err)
 	if len(filename) > 0 {
 		defer func() {
+			os.Remove(filename)
 			os.Remove(logger.getBackupFilename())
 			os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
 		}()
 	}
-	// the following write calls cannot be changed to Write, because of DATA RACE.
 	logger.write([]byte(`foo`))
 	rule.rotatedTime = time.Now().Add(-time.Hour * 24).Format(dateFormat)
 	logger.write([]byte(`bar`))
-	logger.Close()
-	logger.write([]byte(`baz`))
-}
-
-func TestLogWriterClose(t *testing.T) {
-	assert.Nil(t, newLogWriter(nil).Close())
 }

core/logx/syslog_test.go

@@ -29,24 +29,20 @@ func TestRedirector(t *testing.T) {
 }
 
 func captureOutput(f func()) string {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	defer writer.Store(old)
+	atomic.StoreUint32(&initialized, 1)
+	writer := new(mockWriter)
+	infoLog = writer
 
 	prevLevel := atomic.LoadUint32(&logLevel)
 	SetLevel(InfoLevel)
 	f()
 	SetLevel(prevLevel)
 
-	return w.String()
+	return writer.builder.String()
 }
 
 func getContent(jsonStr string) string {
 	var entry logEntry
 	json.Unmarshal([]byte(jsonStr), &entry)
-	val, ok := entry.Content.(string)
-	if ok {
-		return val
-	}
-	return ""
+	return entry.Content.(string)
 }

core/logx/tracelogger.go

@@ -3,79 +3,72 @@ package logx
 import (
 	"context"
 	"fmt"
+	"io"
 	"time"
 
-	"github.com/zeromicro/go-zero/core/timex"
+	"github.com/tal-tech/go-zero/core/timex"
 	"go.opentelemetry.io/otel/trace"
 )
 
-// WithContext sets ctx to log, for keeping tracing information.
-func WithContext(ctx context.Context) Logger {
-	return &traceLogger{
-		ctx: ctx,
-	}
-}
-
 type traceLogger struct {
 	logEntry
-	ctx context.Context
+	Trace string `json:"trace,omitempty"`
+	Span  string `json:"span,omitempty"`
+	ctx   context.Context
 }
 
 func (l *traceLogger) Error(v ...interface{}) {
-	l.err(fmt.Sprint(v...))
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, formatWithCaller(fmt.Sprint(v...), durationCallerDepth))
+	}
 }
 
 func (l *traceLogger) Errorf(format string, v ...interface{}) {
-	l.err(fmt.Sprintf(format, v...))
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, formatWithCaller(fmt.Sprintf(format, v...), durationCallerDepth))
+	}
 }
 
 func (l *traceLogger) Errorv(v interface{}) {
-	l.err(fmt.Sprint(v))
-}
-
-func (l *traceLogger) Errorw(msg string, fields ...LogField) {
-	l.err(msg, fields...)
+	if shallLog(ErrorLevel) {
+		l.write(errorLog, levelError, v)
+	}
 }
 
 func (l *traceLogger) Info(v ...interface{}) {
-	l.info(fmt.Sprint(v...))
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, fmt.Sprint(v...))
+	}
 }
 
 func (l *traceLogger) Infof(format string, v ...interface{}) {
-	l.info(fmt.Sprintf(format, v...))
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, fmt.Sprintf(format, v...))
+	}
 }
 
 func (l *traceLogger) Infov(v interface{}) {
-	l.info(v)
-}
-
-func (l *traceLogger) Infow(msg string, fields ...LogField) {
-	l.info(msg, fields...)
+	if shallLog(InfoLevel) {
+		l.write(infoLog, levelInfo, v)
+	}
 }
 
 func (l *traceLogger) Slow(v ...interface{}) {
-	l.slow(fmt.Sprint(v...))
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, fmt.Sprint(v...))
+	}
 }
 
 func (l *traceLogger) Slowf(format string, v ...interface{}) {
-	l.slow(fmt.Sprintf(format, v...))
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, fmt.Sprintf(format, v...))
+	}
 }
 
 func (l *traceLogger) Slowv(v interface{}) {
-	l.slow(v)
-}
-
-func (l *traceLogger) Sloww(msg string, fields ...LogField) {
-	l.slow(msg, fields...)
-}
-
-func (l *traceLogger) WithContext(ctx context.Context) Logger {
-	if ctx == nil {
-		return l
+	if shallLog(ErrorLevel) {
+		l.write(slowLog, levelSlow, v)
 	}
-
-	l.ctx = ctx
-	return l
 }
 
 func (l *traceLogger) WithDuration(duration time.Duration) Logger {
@@ -83,37 +76,23 @@ func (l *traceLogger) WithDuration(duration time.Duration) Logger {
 	return l
 }
 
-func (l *traceLogger) buildFields(fields ...LogField) []LogField {
-	if len(l.Duration) > 0 {
-		fields = append(fields, Field(durationKey, l.Duration))
-	}
-	traceID := traceIdFromContext(l.ctx)
-	if len(traceID) > 0 {
-		fields = append(fields, Field(traceKey, traceID))
-	}
-	spanID := spanIdFromContext(l.ctx)
-	if len(spanID) > 0 {
-		fields = append(fields, Field(spanKey, spanID))
-	}
-
-	return fields
+func (l *traceLogger) write(writer io.Writer, level string, val interface{}) {
+	outputJson(writer, &traceLogger{
+		logEntry: logEntry{
+			Timestamp: getTimestamp(),
+			Level:     level,
+			Duration:  l.Duration,
+			Content:   val,
+		},
+		Trace: traceIdFromContext(l.ctx),
+		Span:  spanIdFromContext(l.ctx),
+	})
 }
 
-func (l *traceLogger) err(v interface{}, fields ...LogField) {
-	if shallLog(ErrorLevel) {
-		getWriter().Error(v, l.buildFields(fields...)...)
-	}
-}
-
-func (l *traceLogger) info(v interface{}, fields ...LogField) {
-	if shallLog(InfoLevel) {
-		getWriter().Info(v, l.buildFields(fields...)...)
-	}
-}
-
-func (l *traceLogger) slow(v interface{}, fields ...LogField) {
-	if shallLog(ErrorLevel) {
-		getWriter().Slow(v, l.buildFields(fields...)...)
+// WithContext sets ctx to log, for keeping tracing information.
+func WithContext(ctx context.Context) Logger {
+	return &traceLogger{
+		ctx: ctx,
 	}
 }
 

core/logx/tracelogger_test.go

@@ -2,8 +2,7 @@ package logx
 
 import (
 	"context"
-	"encoding/json"
-	"io"
+	"log"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -14,207 +13,111 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 )
 
-func TestTraceLog(t *testing.T) {
-	SetLevel(InfoLevel)
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(old)
-	}()
+const (
+	traceKey = "trace"
+	spanKey  = "span"
+)
 
+func TestTraceLog(t *testing.T) {
+	var buf mockWriter
+	atomic.StoreUint32(&initialized, 1)
 	otp := otel.GetTracerProvider()
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
 	otel.SetTracerProvider(tp)
 	defer otel.SetTracerProvider(otp)
 
-	ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
-	defer span.End()
-
-	WithContext(ctx).Info(testlog)
-	validate(t, w.String(), true, true)
+	ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar")
+	WithContext(ctx).(*traceLogger).write(&buf, levelInfo, testlog)
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
 }
 
 func TestTraceError(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(old)
-	}()
-
+	var buf mockWriter
+	atomic.StoreUint32(&initialized, 1)
+	errorLog = newLogWriter(log.New(&buf, "", flags))
 	otp := otel.GetTracerProvider()
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
 	otel.SetTracerProvider(tp)
 	defer otel.SetTracerProvider(otp)
 
-	ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
-	defer span.End()
-
-	var nilCtx context.Context
-	l := WithContext(context.Background())
-	l = l.WithContext(nilCtx)
-	l = l.WithContext(ctx)
-	SetLevel(ErrorLevel)
+	ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar")
+	l := WithContext(ctx).(*traceLogger)
+	SetLevel(InfoLevel)
 	l.WithDuration(time.Second).Error(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Errorf(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Errorv(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
-	l.WithDuration(time.Second).Errorw(testlog, Field("foo", "bar"))
-	validate(t, w.String(), true, true)
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
 }
 
 func TestTraceInfo(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(old)
-	}()
-
+	var buf mockWriter
+	atomic.StoreUint32(&initialized, 1)
+	infoLog = newLogWriter(log.New(&buf, "", flags))
 	otp := otel.GetTracerProvider()
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
 	otel.SetTracerProvider(tp)
 	defer otel.SetTracerProvider(otp)
 
-	ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
-	defer span.End()
-
-	SetLevel(InfoLevel)
-	l := WithContext(ctx)
-	l.WithDuration(time.Second).Info(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
-	l.WithDuration(time.Second).Infof(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
-	l.WithDuration(time.Second).Infov(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
-	l.WithDuration(time.Second).Infow(testlog, Field("foo", "bar"))
-	validate(t, w.String(), true, true)
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
-}
-
-func TestTraceInfoConsole(t *testing.T) {
-	old := atomic.SwapUint32(&encoding, jsonEncodingType)
-	defer atomic.StoreUint32(&encoding, old)
-
-	w := new(mockWriter)
-	o := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(o)
-	}()
-
-	otp := otel.GetTracerProvider()
-	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
-	otel.SetTracerProvider(tp)
-	defer otel.SetTracerProvider(otp)
-
-	ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
-	defer span.End()
-
-	l := WithContext(ctx)
+	ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar")
+	l := WithContext(ctx).(*traceLogger)
 	SetLevel(InfoLevel)
 	l.WithDuration(time.Second).Info(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Infof(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Infov(testlog)
-	validate(t, w.String(), true, true)
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
 }
 
 func TestTraceSlow(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(old)
-	}()
-
+	var buf mockWriter
+	atomic.StoreUint32(&initialized, 1)
+	slowLog = newLogWriter(log.New(&buf, "", flags))
 	otp := otel.GetTracerProvider()
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
 	otel.SetTracerProvider(tp)
 	defer otel.SetTracerProvider(otp)
 
-	ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
-	defer span.End()
-
-	l := WithContext(ctx)
+	ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar")
+	l := WithContext(ctx).(*traceLogger)
 	SetLevel(InfoLevel)
 	l.WithDuration(time.Second).Slow(testlog)
-	assert.True(t, strings.Contains(w.String(), traceKey))
-	assert.True(t, strings.Contains(w.String(), spanKey))
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Slowf(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Slowv(testlog)
-	validate(t, w.String(), true, true)
-	w.Reset()
-	l.WithDuration(time.Second).Sloww(testlog, Field("foo", "bar"))
-	validate(t, w.String(), true, true)
-	assert.True(t, strings.Contains(w.String(), "foo"), w.String())
-	assert.True(t, strings.Contains(w.String(), "bar"), w.String())
+	assert.True(t, strings.Contains(buf.String(), traceKey))
+	assert.True(t, strings.Contains(buf.String(), spanKey))
 }
 
 func TestTraceWithoutContext(t *testing.T) {
-	w := new(mockWriter)
-	old := writer.Swap(w)
-	writer.lock.RLock()
-	defer func() {
-		writer.lock.RUnlock()
-		writer.Store(old)
-	}()
-
-	l := WithContext(context.Background())
+	var buf mockWriter
+	atomic.StoreUint32(&initialized, 1)
+	infoLog = newLogWriter(log.New(&buf, "", flags))
+	l := WithContext(context.Background()).(*traceLogger)
 	SetLevel(InfoLevel)
 	l.WithDuration(time.Second).Info(testlog)
-	validate(t, w.String(), false, false)
-	w.Reset()
+	assert.False(t, strings.Contains(buf.String(), traceKey))
+	assert.False(t, strings.Contains(buf.String(), spanKey))
+	buf.Reset()
 	l.WithDuration(time.Second).Infof(testlog)
-	validate(t, w.String(), false, false)
-}
-
-func validate(t *testing.T, body string, expectedTrace, expectedSpan bool) {
-	var val mockValue
-	dec := json.NewDecoder(strings.NewReader(body))
-
-	for {
-		var doc mockValue
-		err := dec.Decode(&doc)
-		if err == io.EOF {
-			// all done
-			break
-		}
-		if err != nil {
-			continue
-		}
-
-		val = doc
-	}
-
-	assert.Equal(t, expectedTrace, len(val.Trace) > 0, body)
-	assert.Equal(t, expectedSpan, len(val.Span) > 0, body)
-}
-
-type mockValue struct {
-	Trace string `json:"trace"`
-	Span  string `json:"span"`
+	assert.False(t, strings.Contains(buf.String(), traceKey))
+	assert.False(t, strings.Contains(buf.String(), spanKey))
 }

core/logx/util.go

@@ -1,35 +0,0 @@
-package logx
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"time"
-)
-
-func getCaller(callDepth int) string {
-	_, file, line, ok := runtime.Caller(callDepth)
-	if !ok {
-		return ""
-	}
-
-	return prettyCaller(file, line)
-}
-
-func getTimestamp() string {
-	return time.Now().Format(timeFormat)
-}
-
-func prettyCaller(file string, line int) string {
-	idx := strings.LastIndexByte(file, '/')
-	if idx < 0 {
-		return fmt.Sprintf("%s:%d", file, line)
-	}
-
-	idx = strings.LastIndexByte(file[:idx], '/')
-	if idx < 0 {
-		return fmt.Sprintf("%s:%d", file, line)
-	}
-
-	return fmt.Sprintf("%s:%d", file[idx+1:], line)
-}