Compare commits

..

No commits in common. "main" and "v1.2.8" have entirely different histories.
main ... v1.2.8

7 changed files with 174 additions and 218 deletions

View File

@ -62,7 +62,7 @@ func Warningf(format string, v ...interface{}) {
} }
func Errorf(format string, v ...interface{}) { func Errorf(format string, v ...interface{}) {
mylog.Errorf(format, v...) mylog.Warningf(format, v...)
} }
func Panicf(format string, v ...interface{}) { func Panicf(format string, v ...interface{}) {
@ -73,14 +73,6 @@ func Fatalf(format string, v ...interface{}) {
mylog.Fatalf(format, v...) mylog.Fatalf(format, v...)
} }
func Fatal(v ...interface{}){
mylog.Fatal(v...)
}
func Println(v ...interface{}){
mylog.Println(v...)
}
func TraceInto(format string, v ...interface{}) string { func TraceInto(format string, v ...interface{}) string {
_, fn, line, _ := runtime.Caller(1) _, fn, line, _ := runtime.Caller(1)
strfn := fmt.Sprintf("%s:%d", fn, line) strfn := fmt.Sprintf("%s:%d", fn, line)

6
go.mod
View File

@ -2,8 +2,4 @@ module qoobing.com/gomod/log
go 1.16 go 1.16
require ( require qoobing.com/gomod/str v1.0.1
github.com/tylerb/gls v0.0.0-20150407001822-e606233f194d
github.com/tylerb/is v2.1.4+incompatible // indirect
qoobing.com/gomod/str v1.0.1
)

35
log.go
View File

@ -101,7 +101,6 @@ func (log *Logger) SetLogLevelByName(newlv string) (oldlv string) {
return ErrLogLevel return ErrLogLevel
} }
func (log *Logger) Print(prefix string, v interface{}) { func (log *Logger) Print(prefix string, v interface{}) {
var str = "" var str = ""
if pkg, err := json.Marshal(v); err != nil { if pkg, err := json.Marshal(v); err != nil {
@ -160,15 +159,6 @@ func (log *Logger) Panicf(format string, v ...interface{}) {
log.logwrite(PANIC, 3, format, v...) log.logwrite(PANIC, 3, format, v...)
} }
func (log *Logger) Fatal(v ...interface{}){
log.logwrite(FATAL, 3, "%s", fmt.Sprintln(v...))
}
func (log *Logger) Println(v ...interface{}){
log.logwrite(DEBUG, 3, "%s", fmt.Sprintln(v...))
}
func (log *Logger) GetLogidStr(format string) string { func (log *Logger) GetLogidStr(format string) string {
if logidCreator != nil { if logidCreator != nil {
return fmt.Sprintf(format, logidCreator.GetLogid()) return fmt.Sprintf(format, logidCreator.GetLogid())
@ -195,7 +185,7 @@ func (log *Logger) logwrite(typ LogLevel, calldepth int, format string, v ...int
case WARNING: case WARNING:
log.golog.SetPrefix("\x1b[32m" + "WARN ") log.golog.SetPrefix("\x1b[32m" + "WARN ")
case ERROR: case ERROR:
log.golog.SetPrefix("\x1b[33m" + "ERRO ") log.golog.SetPrefix("\x1b[32m" + "ERRO ")
case INFO: case INFO:
log.golog.SetPrefix("INFO ") log.golog.SetPrefix("INFO ")
case NOTICE: case NOTICE:
@ -236,13 +226,6 @@ func needWriteLogToFile() bool {
return true return true
} }
func needWriteLogToStdout() bool {
if cls, ok := os.LookupEnv("QOOLOG_CLOSE_STDLOG"); ok && (cls == "Y" || cls == "y") {
return false
}
return true
}
// ////////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////////
// ///////////////////////Initialize///////////////////////////////////////////////// // ///////////////////////Initialize/////////////////////////////////////////////////
// ////////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////////
@ -265,14 +248,14 @@ func initlog() {
gologFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile gologFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile
) )
// Step 2.1 add stdout to base writer if need // Step 2. init golog(golang std logger) & mylog(myself defined logger)
if needWriteLogToStdout() { golog = log.New(NewCacheWriter(baseWriter), "", gologFlags)
baseWriter.stdw = os.Stdout mylog = New("system")
}
// Step 2.2 rotate log(split log ) if need // Step 3. backgroud split log (log rotate) if need
if needWriteLogToFile() { if needWriteLogToFile() {
baseWriter.OpenLogFile(logDir, logName, logDirsOptional)
go func() { go func() {
baseWriter.OpenLogFile(logDir, logName, logDirsOptional)
for { for {
tag := time.Now().Local().Format(logSplitTag) tag := time.Now().Local().Format(logSplitTag)
baseWriter.TryBackupLogFile(tag) baseWriter.TryBackupLogFile(tag)
@ -280,8 +263,4 @@ func initlog() {
} }
}() }()
} }
// Step 3. init golog(golang std logger) & mylog(myself defined logger)
golog = log.New(NewCacheWriter(baseWriter), "", gologFlags)
mylog = New("system")
} }

View File

@ -1,9 +0,0 @@
package log
import "testing"
func TestLog(t *testing.T) {
Println("aaa", 1,3)
Fatal("aaa", 1,3)
Fatalf("aaa=%d", 1)
}

View File

@ -1,5 +1,4 @@
// +build glslogid // +build glslogid
package log package log
import ( import (

View File

@ -1,5 +1,4 @@
// +build runtimelogid // +build runtimelogid
package log package log
//// Format writes the source file path and line number of the record to the buf. //// Format writes the source file path and line number of the record to the buf.

View File

@ -130,5 +130,5 @@ func (w *cacheWriter) StartCacheLog() {
func (w *cacheWriter) StopCacheLog() { func (w *cacheWriter) StopCacheLog() {
w.cacheLock.Unlock() w.cacheLock.Unlock()
w.cacheing = false w.cacheing = true
} }