github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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
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 {
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
}