调整代码

Author: FishGoddess

FUTURE.md

@@ -5,6 +5,7 @@
 * [x] 提高单元测试覆盖率到 80%
 * [x] 增加快速时钟，可以非常快速地查询时间
 * [ ] 提高单元测试覆盖率到 90%
+* [ ] 增加按天日期进行分裂的文件写出器
 
 ### v1.5.x
 

HISTORY.md

@@ -1,5 +1,11 @@
 ## ✒ 历史版本的特性介绍 (Features in old versions)
 
+### v1.8.3
+
+> 此版本发布于 2025-05-15
+
+* 继续调整代码
+
 ### v1.8.2
 
 > 此版本发布于 2025-03-15

_icons/coverage.svg

@@ -122,6 +122,5 @@ func (c *config) newHandler() (slog.Handler, Syncer, io.Closer, error) {
 	handler := newHandler(writer, opts)
 	syncer := c.newSyncer(handler, writer)
 	closer := c.newCloser(handler, writer)
-
 	return handler, syncer, closer, nil
 }

config.go

@@ -22,20 +22,20 @@ import (
 	"github.com/FishGoddess/logit/defaults"
 )
 
-var defaultLogger atomic.Value
+var defaultLogger atomic.Pointer[*Logger]
 
 func init() {
 	SetDefault(NewLogger())
 }
 
 // SetDefault sets logger as the default logger.
 func SetDefault(logger *Logger) {
-	defaultLogger.Store(logger)
+	defaultLogger.Store(&logger)
 }
 
 // Default returns the default logger.
 func Default() *Logger {
-	return defaultLogger.Load().(*Logger)
+	return *defaultLogger.Load()
 }
 
 // Debug logs a log with msg and args in debug level.

default.go

@@ -25,25 +25,26 @@ import (
 
 // go test -v -cover -count=1 -test.cpu=1 -run=^TestSetDefault$
 func TestSetDefault(t *testing.T) {
-	defaultLogger.Store(NewLogger())
-
 	logger := NewLogger()
+	defaultLogger.Store(&logger)
+
+	logger = NewLogger()
 	SetDefault(logger)
 
-	gotLogger, ok := defaultLogger.Load().(*Logger)
-	if !ok {
-		t.Fatalf("logger type %T is wrong", defaultLogger.Load())
+	gotLogger := defaultLogger.Load()
+	if gotLogger == nil {
+		t.Fatal("gotLogger == nil")
 	}
 
-	if gotLogger != logger {
+	if *gotLogger != logger {
 		t.Fatalf("gotLogger %+v != logger %+v", gotLogger, logger)
 	}
 }
 
 // go test -v -cover -count=1 -test.cpu=1 -run=^TestDefault$
 func TestDefault(t *testing.T) {
 	logger := NewLogger()
-	defaultLogger.Store(logger)
+	defaultLogger.Store(&logger)
 
 	gotLogger := Default()
 	if gotLogger != logger {

default_test.go

@@ -90,7 +90,6 @@ func (th *tapeHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
 
 	handler := *th
 	handler.attrs = append(handler.attrs, attrs...)
-
 	return &handler
 }
 
@@ -107,7 +106,6 @@ func (th *tapeHandler) WithGroup(name string) slog.Handler {
 
 	handler.group = handler.group + name
 	handler.groups = append(handler.groups, name)
-
 	return &handler
 }
 
@@ -149,49 +147,42 @@ func (th *tapeHandler) appendKey(bs []byte, group string, key string) []byte {
 
 	bs = appendEscapedString(bs, key)
 	bs = append(bs, keyValueConnector)
-
 	return bs
 }
 
 func (th *tapeHandler) appendBool(bs []byte, value bool) []byte {
 	bs = strconv.AppendBool(bs, value)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendInt64(bs []byte, value int64) []byte {
 	bs = strconv.AppendInt(bs, value, 10)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendUint64(bs []byte, value uint64) []byte {
 	bs = strconv.AppendUint(bs, value, 10)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendFloat64(bs []byte, value float64) []byte {
 	bs = strconv.AppendFloat(bs, value, 'f', -1, 64)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendString(bs []byte, value string) []byte {
 	bs = appendEscapedString(bs, value)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendDuration(bs []byte, value time.Duration) []byte {
 	bs = append(bs, value.String()...)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
@@ -263,38 +254,33 @@ func (th *tapeHandler) appendTime(bs []byte, value time.Time) []byte {
 
 	bs = strconv.AppendInt(bs, int64(mircosecond), 10)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
 func (th *tapeHandler) appendAny(bs []byte, value any) []byte {
 	if err, ok := value.(error); ok {
 		bs = append(bs, err.Error()...)
 		bs = append(bs, attrConnector...)
-
 		return bs
 	}
 
 	if stringer, ok := value.(fmt.Stringer); ok {
 		bs = append(bs, stringer.String()...)
 		bs = append(bs, attrConnector...)
-
 		return bs
 	}
 
 	marshaled, err := json.Marshal(value)
 	if err == nil {
 		bs = append(bs, marshaled...)
 		bs = append(bs, attrConnector...)
-
 		return bs
 	}
 
 	defaults.HandleError("json.Marshal", err)
 
 	bs = fmt.Appendf(bs, "%+v", value)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 
@@ -317,7 +303,6 @@ func (th *tapeHandler) appendAttr(bs []byte, group string, attr slog.Attr) []byt
 
 	if kind == slog.KindGroup {
 		bs = th.appendAttrs(bs, attr.Key, attr.Value.Group())
-
 		return bs
 	}
 
@@ -367,7 +352,6 @@ func (th *tapeHandler) appendSource(bs []byte, pc uintptr) []byte {
 	bs = append(bs, sourceConnector)
 	bs = strconv.AppendInt(bs, int64(frame.Line), 10)
 	bs = append(bs, attrConnector...)
-
 	return bs
 }
 

handler/tape.go

@@ -101,14 +101,15 @@ func (l *Logger) runSyncTimer(d time.Duration) {
 		select {
 		case <-timer.C:
 			if err := l.Sync(); err != nil {
-				defaults.HandleError("Logger.Sync", err)
+				defaults.HandleError("logit.Logger.Sync", err)
 			}
 		}
 	}
 }
 
 func (l *Logger) clone() *Logger {
 	newLogger := *l
+
 	return &newLogger
 }
 
@@ -153,7 +154,6 @@ func (l *Logger) With(args ...any) *Logger {
 
 	newLogger := l.clone()
 	newLogger.handler = l.handler.WithAttrs(attrs)
-
 	return newLogger
 }
 
@@ -167,7 +167,6 @@ func (l *Logger) WithGroup(name string) *Logger {
 
 	newLogger := l.clone()
 	newLogger.handler = l.handler.WithGroup(name)
-
 	return newLogger
 
 }
@@ -204,6 +203,7 @@ func (l *Logger) PrintEnabled() bool {
 
 func (l *Logger) newRecord(level slog.Level, msg string, args []any) slog.Record {
 	var pc uintptr
+
 	if l.withSource {
 		var pcs [1]uintptr
 		runtime.Callers(defaults.CallerDepth, pcs[:])

logger.go

@@ -26,6 +26,7 @@ import (
 
 type testLoggerHandler struct {
 	slog.TextHandler
+
 	w    io.Writer
 	opts slog.HandlerOptions
 }

logger_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/FishGoddess/logit/writer"
 )
 
-// Option sets some fields to config.
 type Option func(conf *config)
 
 func (o Option) applyTo(conf *config) {