|
@@ -188,6 +188,10 @@ func (g *GeoIP2) GetCountry(ip net.IP) (country, continent string, netmask int)
|
|
g.country.l.RLock()
|
|
g.country.l.RLock()
|
|
defer g.country.l.RUnlock()
|
|
defer g.country.l.RUnlock()
|
|
|
|
|
|
|
|
+ if !g.country.active {
|
|
|
|
+ return "", "", 0
|
|
|
|
+ }
|
|
|
|
+
|
|
c, err := g.country.db.Country(ip)
|
|
c, err := g.country.db.Country(ip)
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Printf("Could not lookup country for '%s': %s", ip.String(), err)
|
|
log.Printf("Could not lookup country for '%s': %s", ip.String(), err)
|
|
@@ -215,6 +219,10 @@ func (g *GeoIP2) GetLocation(ip net.IP) (l *geo.Location, err error) {
|
|
g.city.l.RLock()
|
|
g.city.l.RLock()
|
|
defer g.city.l.RUnlock()
|
|
defer g.city.l.RUnlock()
|
|
|
|
|
|
|
|
+ if !g.city.active {
|
|
|
|
+ return nil, fmt.Errorf("city db not active")
|
|
|
|
+ }
|
|
|
|
+
|
|
c, err := g.city.db.City(ip)
|
|
c, err := g.city.db.City(ip)
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Printf("Could not lookup CountryRegion for '%s': %s", ip.String(), err)
|
|
log.Printf("Could not lookup CountryRegion for '%s': %s", ip.String(), err)
|