diff --git a/intel/geoip/database.go b/intel/geoip/database.go index 96bf62d1..512ce0c0 100644 --- a/intel/geoip/database.go +++ b/intel/geoip/database.go @@ -59,20 +59,20 @@ func doReload() error { func openDBs() 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 { 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 { return err } - file, err = updates.GetFile("intel/geoip/geoip-asn.mmdb") + dbASNFile, err = updates.GetFile("intel/geoip/geoip-asn.mmdb") if err != nil { 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 { return err } diff --git a/intel/geoip/module.go b/intel/geoip/module.go index 94827e6a..be6a02ff 100644 --- a/intel/geoip/module.go +++ b/intel/geoip/module.go @@ -4,6 +4,7 @@ import ( "context" "github.com/safing/portbase/modules" + "github.com/safing/portmaster/updates" ) var ( @@ -16,9 +17,9 @@ func init() { func prep() error { return module.RegisterEventHook( - "updates", - "resource update", - "upgrade databases", + updates.ModuleName, + updates.ResourceUpdateEvent, + "Check for GeoIP database updates", upgradeDatabases, ) }