diff --git a/cmd/main.go b/cmd/main.go index 3656795..097116e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,6 +4,8 @@ import ( "os" "time" + "context" + "github.com/sagernet/sing-box/log" "github.com/spf13/cobra" @@ -32,7 +34,7 @@ func main() { func preRun(cmd *cobra.Command, args []string) { if disableColor { - log.SetStdLogger(log.NewFactory(log.Formatter{BaseTime: time.Now(), DisableColors: true}, os.Stderr, nil).Logger()) + log.SetStdLogger(log.NewDefaultFactory(context.Background(), log.Formatter{BaseTime: time.Now(), DisableColors: true}, os.Stderr, "", nil, false).Logger()) } if workingDir != "" { _, err := os.Stat(workingDir) diff --git a/custom/service.go b/custom/service.go index b677c98..9f2bc66 100644 --- a/custom/service.go +++ b/custom/service.go @@ -36,8 +36,8 @@ func NewService(options option.Options) (*libbox.BoxService, error) { ctx = filemanager.WithDefault(ctx, sWorkingPath, sTempPath, sUserID, sGroupID) urlTestHistoryStorage := urltest.NewHistoryStorage() ctx = service.ContextWithPtr(ctx, urlTestHistoryStorage) - pauseManager := pause.NewDefaultManager(ctx) - ctx = pause.ContextWithManager(ctx, pauseManager) + pauseManager := pause.WithDefaultManager(ctx) + // ctx = pause.ContextWithManager(ctx, pauseManager) instance, err := B.New(B.Options{ Context: ctx, Options: options,