Skip to content

feat: add log control #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions producer/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,34 @@ import (
"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"gopkg.in/natefinch/lumberjack.v2"
"os"
"io"
"os"
)

func logConfig(producerConfig *ProducerConfig) log.Logger {
var writer io.Writer
if producerConfig.LogFileName == "" {
writer = log.NewSyncWriter(os.Stdout)
} else {
if producerConfig.LogMaxSize == 0 {
producerConfig.LogMaxSize = 10
}
if producerConfig.LogMaxBackups == 0 {
producerConfig.LogMaxBackups = 10
}
writer = &lumberjack.Logger{
Filename: producerConfig.LogFileName,
MaxSize: producerConfig.LogMaxSize,
MaxBackups: producerConfig.LogMaxBackups,
Compress: producerConfig.LogCompress,

if producerConfig.Logger {
if producerConfig.LogFileName == "" {
writer = log.NewSyncWriter(os.Stdout)
} else {
if producerConfig.LogMaxSize == 0 {
producerConfig.LogMaxSize = 10
}
if producerConfig.LogMaxBackups == 0 {
producerConfig.LogMaxBackups = 10
}
writer = &lumberjack.Logger{
Filename: producerConfig.LogFileName,
MaxSize: producerConfig.LogMaxSize,
MaxBackups: producerConfig.LogMaxBackups,
Compress: producerConfig.LogCompress,
}
}
} else {
writer = NullWriter{}
}

var logger log.Logger
if producerConfig.IsJsonType {
logger = log.NewJSONLogger(writer)
Expand Down
3 changes: 3 additions & 0 deletions producer/producer_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ type ProducerConfig struct {
Region string
AuthVersion sls.AuthVersionType
CompressType int // only work for logstore now

Logger bool // print the log
}

func GetDefaultProducerConfig() *ProducerConfig {
Expand All @@ -71,5 +73,6 @@ func GetDefaultProducerConfig() *ProducerConfig {
MaxBatchCount: 4096,
NoRetryStatusCodeList: []int{400, 404},
CompressType: sls.Compress_LZ4,
Logger: true,
}
}
8 changes: 8 additions & 0 deletions producer/writer.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package producer

type NullWriter struct {
}

func (u NullWriter) Write(p []byte) (n int, err error) {
return 0, err
}