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

Fix missing context in geo resources download

Browse source
This commit is contained in:
世界 2023-09-23 12:41:51 +08:00
parent 17584c245f
commit c60a944aac
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,14 +143,16 @@ func create() (*box.Box, context.CancelFunc, error) {
signal.Stop(osSignals) signal.Stop(osSignals)
close(osSignals) close(osSignals)
}() }()
startCtx, finishStart := context.WithCancel(context.Background())
go func() { go func() {
_, loaded := <-osSignals _, loaded := <-osSignals
if loaded { if loaded {
cancel() cancel()
closeMonitor(startCtx)
} }
}() }()
err = instance.Start() err = instance.Start()
finishStart()
if err != nil { if err != nil {
cancel() cancel()
return nil, nil, E.Cause(err, "start service") return nil, nil, E.Cause(err, "start service")

12
route/router_geo_resources.go
View file

@ -173,7 +173,11 @@ func (r *Router) downloadGeoIPDatabase(savePath string) error {
}, },
} }
defer httpClient.CloseIdleConnections() defer httpClient.CloseIdleConnections()
response, err := httpClient.Get(downloadURL) request, err := http.NewRequest("GET", downloadURL, nil)
if err != nil {
return err
}
response, err := httpClient.Do(request.WithContext(r.ctx))
if err != nil { if err != nil {
return err return err
} }
@ -221,7 +225,11 @@ func (r *Router) downloadGeositeDatabase(savePath string) error {
}, },
} }
defer httpClient.CloseIdleConnections() defer httpClient.CloseIdleConnections()
response, err := httpClient.Get(downloadURL) request, err := http.NewRequest("GET", downloadURL, nil)
if err != nil {
return err
}
response, err := httpClient.Do(request.WithContext(r.ctx))
if err != nil { if err != nil {
return err return err
} }