Austin/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2024-11-16 03:32:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: auto update geo

Browse Source
This commit is contained in:
Larvan2 2024-05-19 17:30:39 +08:00 committed by wwqgtxx
parent e749c7e492
commit 4243a74284
3 changed files with 42 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
component/updater/update_geo.go
View File

@ -98,11 +98,13 @@ func updateGeoDatabases() error {
return nil
}
func UpdateGeoDatabases(updateNotification chan struct{}) error {
var ErrGetDatabaseUpdateSkip = errors.New("GEO database is updating, skip")
func UpdateGeoDatabases() error {
log.Infoln("[GEO] Start updating GEO database")
if UpdatingGeo.Load() {
return errors.New("GEO database is updating, skip")
return ErrGetDatabaseUpdateSkip
}
UpdatingGeo.Store(true)
@ -115,7 +117,6 @@ func UpdateGeoDatabases(updateNotification chan struct{}) error {
return err
}
updateNotification <- struct{}{}
return nil
}
@ -136,17 +137,16 @@ func getUpdateTime() (err error, time time.Time) {
return nil, fileInfo.ModTime()
}
func RegisterGeoUpdater(updateNotification chan struct{}) {
func RegisterGeoUpdater(onSuccess func()) {
if C.GeoUpdateInterval <= 0 {
log.Errorln("[GEO] Invalid update interval: %d", C.GeoUpdateInterval)
return
}
go func() {
ticker := time.NewTicker(time.Duration(C.GeoUpdateInterval) * time.Hour)
defer ticker.Stop()
log.Infoln("[GEO] update GEO database every %d hours", C.GeoUpdateInterval)
go func() {
err, lastUpdate := getUpdateTime()
if err != nil {
log.Errorln("[GEO] Get GEO database update time error: %s", err.Error())
@ -156,15 +156,20 @@ func RegisterGeoUpdater(updateNotification chan struct{}) {
log.Infoln("[GEO] last update time %s", lastUpdate)
if lastUpdate.Add(time.Duration(C.GeoUpdateInterval) * time.Hour).Before(time.Now()) {
log.Infoln("[GEO] Database has not been updated for %v, update now", time.Duration(C.GeoUpdateInterval)*time.Hour)
if err := UpdateGeoDatabases(updateNotification); err != nil {
if err := UpdateGeoDatabases(); err != nil {
log.Errorln("[GEO] Failed to update GEO database: %s", err.Error())
return
} else {
onSuccess()
}
}
for range ticker.C {
if err := UpdateGeoDatabases(updateNotification); err != nil {
log.Infoln("[GEO] updating database every %d hours", C.GeoUpdateInterval)
if err := UpdateGeoDatabases(); err != nil {
log.Errorln("[GEO] Failed to update GEO database: %s", err.Error())
} else {
onSuccess()
}
}
}()

40
hub/route/configs.go
View File

@ -364,19 +364,14 @@ func updateConfigs(w http.ResponseWriter, r *http.Request) {
}
func updateGeoDatabases(w http.ResponseWriter, r *http.Request) {
updateNotification := make(chan struct{})
errorChannel := make(chan error, 1)
done := make(chan struct{})
defer func() {
close(updateNotification)
close(errorChannel)
}()
err := updater.UpdateGeoDatabases()
if err != nil {
log.Errorln("[REST-API] update GEO databases failed: %v", err)
render.Status(r, http.StatusInternalServerError)
render.JSON(w, r, newError(err.Error()))
return
}
go func() {
defer close(done)
for {
select {
case <-updateNotification:
cfg, err := executor.ParseWithPath(C.Path.Config())
if err != nil {
log.Errorln("[REST-API] update GEO databases failed: %v", err)
@ -385,26 +380,9 @@ func updateGeoDatabases(w http.ResponseWriter, r *http.Request) {
return
}
log.Warnln("[REST-API] update GEO databases success, applying config")
log.Warnln("[GEO] update GEO databases success, applying config")
executor.ApplyConfig(cfg, false)
return
case err := <-errorChannel:
log.Errorln("[REST-API] update GEO databases failed: %v", err)
render.Status(r, http.StatusInternalServerError)
render.JSON(w, r, err.Error())
return
}
}
}()
go func() {
err := updater.UpdateGeoDatabases(updateNotification)
if err != nil {
errorChannel <- err
}
}()
<-done
render.NoContent(w, r)
}

10
main.go
View File

@ -113,11 +113,7 @@ func main() {
}
if C.GeoAutoUpdate {
updateNotification := make(chan struct{})
go updater.RegisterGeoUpdater(updateNotification)
go func() {
for range updateNotification {
updater.RegisterGeoUpdater(func() {
cfg, err := executor.ParseWithPath(C.Path.Config())
if err != nil {
log.Errorln("[GEO] update GEO databases failed: %v", err)
@ -127,9 +123,9 @@ func main() {
log.Warnln("[GEO] update GEO databases success, applying config")
executor.ApplyConfig(cfg, false)
})
}
}()
}
defer executor.Shutdown()
termSign := make(chan os.Signal, 1)