refactor and remove unused

Author: will_wang

.gitignore

@@ -8,8 +8,6 @@ _obj
 _test
 
 # Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
 
 *.cgo1.go
 *.cgo2.c
@@ -23,3 +21,5 @@ _testmain.go
 
 *.vscode
 .idea
+*.log
+vendor/

README.md

@@ -1,16 +1,15 @@
 # log4go
 
-轻量级log模块，源于google的一项log工程，官方已经停止维护更新，这里fork一份自用。
+Lightweight log module, derived from a Google log project, officially has stopped maintenance update, here fork a copy of your own.
 
->with go1.14 and support go mod 
+>with go1.16+ and support go mod 
 
 ### Install
 
-`go get github.com/kdpujie/log4go`
+`go get github.com/imb2022/log4go`
 
 ### Features
 
-* 日志输出到文件，支持按日期对文件进行分割
-* 日志输出到控制台
-* 支持syslog协议.
-* 支持写入阿里云日志服务
+* logs can be output to files and files can be divided by date
+* logs can output to the console
+* supports the syslog protocol

aliyun_loghub_writer.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/kdpujie/log4go/util"
+	"github.com/imb2022/log4go/util"
 )
 
 // GlobalLevel global level
@@ -42,21 +42,49 @@ type ConfAliLogHubWriter struct {
 
 // LogConfig log config
 type LogConfig struct {
-	Level           string              `json:"level" mapstructure:"level"`
-	FullPath        bool                `json:"full_path" mapstructure:"full_path"`
-	FileWriter      ConfFileWriter      `json:"file_writer" mapstructure:"file_writer"`
-	ConsoleWriter   ConfConsoleWriter   `json:"console_writer" mapstructure:"console_writer"`
-	AliLogHubWriter ConfAliLogHubWriter `json:"ali_log_hub_writer" mapstructure:"ali_log_hub_writer"`
-	KafKaWriter     ConfKafKaWriter     `json:"kafka_writer" mapstructure:"kafka_writer"`
+	// global level, maybe override by real minimum multi writer level
+	Level         string            `json:"level" mapstructure:"level"`
+	FullPath      bool              `json:"full_path" mapstructure:"full_path"`
+	FileWriter    ConfFileWriter    `json:"file_writer" mapstructure:"file_writer"`
+	ConsoleWriter ConfConsoleWriter `json:"console_writer" mapstructure:"console_writer"`
+	KafKaWriter   ConfKafKaWriter   `json:"kafka_writer" mapstructure:"kafka_writer"`
 }
 
-// SetupLog setup log
+// SetupLog setup log, caller shall use this method
 func SetupLog(lc LogConfig) (err error) {
-	// 全局配置
+	// global config
 	GlobalLevel = getLevel(lc.Level)
 
+	// writer enable
+	// 1. if not set level, use global level;
+	// 2. if set level, use min level
+	validGlobalMinLevel := FATAL // default max level
+	validGlobalMinLevelBy := "global"
+
+	if lc.FileWriter.Enable {
+		validGlobalMinLevel = util.MinInt(getLevel0(lc.FileWriter.Level, GlobalLevel), validGlobalMinLevel)
+		if validGlobalMinLevel == getLevel0(lc.FileWriter.Level, GlobalLevel) {
+			validGlobalMinLevelBy = "file_writer"
+		}
+	}
+
+	if lc.ConsoleWriter.Enable {
+		validGlobalMinLevel = util.MinInt(getLevel0(lc.ConsoleWriter.Level, GlobalLevel), validGlobalMinLevel)
+		if validGlobalMinLevel == getLevel0(lc.ConsoleWriter.Level, GlobalLevel) {
+			validGlobalMinLevelBy = "console_writer"
+		}
+	}
+
+	if lc.KafKaWriter.Enable {
+		validGlobalMinLevel = util.MinInt(getLevel0(lc.KafKaWriter.Level, GlobalLevel), validGlobalMinLevel)
+		if validGlobalMinLevel == getLevel0(lc.KafKaWriter.Level, GlobalLevel) {
+			validGlobalMinLevelBy = "kafka_writer"
+		}
+	}
+
 	fullPath := lc.FullPath
 	ShowFullPath(fullPath)
+	SetLevel(validGlobalMinLevel)
 
 	if lc.FileWriter.Enable {
 		w := NewFileWriter()
@@ -74,25 +102,13 @@ func SetupLog(lc LogConfig) (err error) {
 		Register(w)
 	}
 
-	if lc.AliLogHubWriter.Enable {
-		w := NewAliLogHubWriter(lc.AliLogHubWriter.BufSize)
-		if lc.AliLogHubWriter.LogSource == "" {
-			lc.AliLogHubWriter.LogSource = util.GetLocalIpByTcp()
-		}
-		w.level = getLevel0(lc.AliLogHubWriter.Level, GlobalLevel)
-		w.SetLog(lc.AliLogHubWriter.LogName, lc.AliLogHubWriter.LogSource)
-		w.SetProject(lc.AliLogHubWriter.ProjectName, lc.AliLogHubWriter.StoreName)
-		w.SetEndpoint(lc.AliLogHubWriter.Endpoint)
-		w.SetAccessKey(lc.AliLogHubWriter.AccessKeyId, lc.AliLogHubWriter.AccessKeySecret)
-		Register(w)
-	}
-
 	if lc.KafKaWriter.Enable {
 		w := NewKafKaWriter(&lc.KafKaWriter)
 		w.level = getLevel0(lc.KafKaWriter.Level, GlobalLevel)
 		Register(w)
 	}
-	// 全局配置
+
+	log.Printf("validGlobalLevel(min:%v, by:%v)", validGlobalMinLevel, validGlobalMinLevelBy)
 	return nil
 }
 
@@ -113,13 +129,13 @@ func getLevel(flag string) int {
 	return getLevel0(flag, DEBUG)
 }
 
-// 默认为Debug模式
+// default DEBUG
 func getLevel0(flag string, defaultFlag int) int {
 	for i, f := range LevelFlags {
 		if strings.TrimSpace(strings.ToUpper(flag)) == f {
 			return i
 		}
 	}
-	log.Printf("[ERROR] 未找到合适的日志级别[%s]，使用默认值:%d\n", flag, defaultFlag)
+	log.Printf("[log4go] WARN, no match level for: %v, use default level: %d\n", flag, defaultFlag)
 	return defaultFlag
 }

config.go

@@ -11,17 +11,6 @@
     "enable": true,
     "color": true
   },
-  "ali_log_hub_writer": {
-    "level": "debug",
-    "enable": false,
-    "log_name": "",
-    "project_name": "",
-    "endpoint": "",
-    "access_key_id": "",
-    "access_key_secret": "",
-    "store_name": "dsp_syslog",
-    "buf_size": 1000
-  },
   "kafka_writer": {
     "level": "ERROR",
     "on": false,

examples/conf/log.json

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/kdpujie/log4go"
+	log "github.com/imb2022/log4go"
 )
 
 func main() {

examples/conf/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	log "github.com/kdpujie/log4go"
+	log "github.com/imb2022/log4go"
 )
 
 // SetLog set logger
@@ -17,7 +17,7 @@ func main() {
 	SetLog()
 	defer log.Close()
 
-	var name = "skoo"
+	var name = "xwi88"
 	log.Debug("log4go by %s", name)
 	log.Info("log4go by %s", name)
 	log.Warn("log4go by %s", name)

examples/console/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/kdpujie/log4go"
+	log "github.com/imb2022/log4go"
 )
 
 func SetLog() {
@@ -30,7 +30,7 @@ func main() {
 	SetLog()
 	defer log.Close()
 
-	var name = "skoo"
+	var name = "xwi88"
 
 	for {
 		log.Debug("log4go by %s", name)

examples/file/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"time"
 
-	log "github.com/kdpujie/log4go"
-	"github.com/kdpujie/log4go/util"
+	log "github.com/imb2022/log4go"
+	"github.com/imb2022/log4go/util"
 )
 
 // SetLog set logger

examples/kafka/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/kdpujie/log4go"
+	"github.com/imb2022/log4go"
 )
 
 func SetLog() (logger *log4go.Logger) {
@@ -15,15 +15,15 @@ func SetLog() (logger *log4go.Logger) {
 
 	logger = log4go.NewLogger()
 	logger.Register(w)
-	logger.SetLevel(log4go.ERROR)
+	logger.SetLevel(log4go.DEBUG) // global min level
 	return
 }
 
 func main() {
 	logger := SetLog()
 	defer logger.Close()
 
-	var name = "skoo"
+	var name = "xwi88"
 	logger.Debug("log4go by %s", name)
 	logger.Info("log4go by %s", name)
 	logger.Warn("log4go by %s", name)