SagerNet/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-04-05 21:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix rule-set not closed

Browse source
This commit is contained in:
世界 2025-02-01 19:42:32 +08:00
parent 27c31eac5d
commit 9b4c11ba95
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
route/router.go
View file

@ -484,6 +484,13 @@ func (r *Router) Close() error {
}) })
monitor.Finish() monitor.Finish()
} }
for i, ruleSet := range r.ruleSets {
monitor.Start("close rule-set[", i, "]")
err = E.Append(err, ruleSet.Close(), func(err error) error {
return E.Cause(err, "close rule-set[", i, "]")
})
monitor.Finish()
}
return err return err
} }

2
route/rule/rule_set_local.go
View file

@ -56,7 +56,7 @@ func NewLocalRuleSet(ctx context.Context, logger logger.Logger, options option.R
} }
} else { } else {
filePath := filemanager.BasePath(ctx, options.LocalOptions.Path) filePath := filemanager.BasePath(ctx, options.LocalOptions.Path)
filePath, _ = filepath.Abs(options.LocalOptions.Path) filePath, _ = filepath.Abs(filePath)
err := ruleSet.reloadFile(filePath) err := ruleSet.reloadFile(filePath)
if err != nil { if err != nil {
return nil, err return nil, err