vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 02:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix geoip database upgrade handling

Browse source
This commit is contained in:
Patrick Pacher 2020-04-03 14:19:20 +02:00 • committed by ppacher
parent 85b5cf02a4
commit a3a591740e
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
intel/geoip/database.go
View file

@ -59,20 +59,20 @@ func doReload() error {
func openDBs() error { func openDBs() error {
var err error var err error
file, err := updates.GetFile("intel/geoip/geoip-city.mmdb") dbCityFile, err = updates.GetFile("intel/geoip/geoip-city.mmdb")
if err != nil { if err != nil {
return fmt.Errorf("could not get GeoIP City database file: %s", err) return fmt.Errorf("could not get GeoIP City database file: %s", err)
} }
dbCity, err = maxminddb.Open(file.Path()) dbCity, err = maxminddb.Open(dbCityFile.Path())
if err != nil { if err != nil {
return err return err
} }
file, err = updates.GetFile("intel/geoip/geoip-asn.mmdb") dbASNFile, err = updates.GetFile("intel/geoip/geoip-asn.mmdb")
if err != nil { if err != nil {
return fmt.Errorf("could not get GeoIP ASN database file: %s", err) return fmt.Errorf("could not get GeoIP ASN database file: %s", err)
} }
dbASN, err = maxminddb.Open(file.Path()) dbASN, err = maxminddb.Open(dbASNFile.Path())
if err != nil { if err != nil {
return err return err
} }

7
intel/geoip/module.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"github.com/safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/safing/portmaster/updates"
) )
var ( var (
@ -16,9 +17,9 @@ func init() {
func prep() error { func prep() error {
return module.RegisterEventHook( return module.RegisterEventHook(
"updates", updates.ModuleName,
"resource update", updates.ResourceUpdateEvent,
"upgrade databases", "Check for GeoIP database updates",
upgradeDatabases, upgradeDatabases,
) )
} }