black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 10:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply --disable-color to global logger

Browse source
This commit is contained in:
世界 2023-03-13 11:23:00 +08:00
parent 7d22cf9b45
commit caad60da45
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/sing-box/main.go
View file

@ -2,6 +2,7 @@ package main
import ( import (
"os" "os"
"time"
_ "github.com/sagernet/sing-box/include" _ "github.com/sagernet/sing-box/include"
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
@ -33,6 +34,9 @@ func main() {
} }
func preRun(cmd *cobra.Command, args []string) { func preRun(cmd *cobra.Command, args []string) {
if disableColor {
log.SetStdLogger(log.NewFactory(log.Formatter{BaseTime: time.Now(), DisableColors: true}, os.Stderr, nil).Logger())
}
if workingDir != "" { if workingDir != "" {
if err := os.Chdir(workingDir); err != nil { if err := os.Chdir(workingDir); err != nil {
log.Fatal(err) log.Fatal(err)

4
log/export.go
View file

@ -16,6 +16,10 @@ func StdLogger() ContextLogger {
return std return std
} }
func SetStdLogger(logger ContextLogger) {
std = logger
}
func Trace(args ...any) { func Trace(args ...any) {
std.Trace(args...) std.Trace(args...)
} }

29
log/factory.go
View file

@ -1,11 +1,15 @@
package log package log
import ( import (
"context" "github.com/sagernet/sing/common/logger"
"github.com/sagernet/sing/common/observable" "github.com/sagernet/sing/common/observable"
) )
type (
Logger logger.Logger
ContextLogger logger.ContextLogger
)
type Factory interface { type Factory interface {
Level() Level Level() Level
SetLevel(level Level) SetLevel(level Level)
@ -22,24 +26,3 @@ type Entry struct {
Level Level Level Level
Message string Message string
} }
type Logger interface {
Trace(args ...any)
Debug(args ...any)
Info(args ...any)
Warn(args ...any)
Error(args ...any)
Fatal(args ...any)
Panic(args ...any)
}
type ContextLogger interface {
Logger
TraceContext(ctx context.Context, args ...any)
DebugContext(ctx context.Context, args ...any)
InfoContext(ctx context.Context, args ...any)
WarnContext(ctx context.Context, args ...any)
ErrorContext(ctx context.Context, args ...any)
FatalContext(ctx context.Context, args ...any)
PanicContext(ctx context.Context, args ...any)
}