byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #238 from smtpd/revert-237-revert-236-geoip-crash

Browse Source 
Don't crash QP when GeoIP data is missing
This commit is contained in:
Matt Simerson 2015-02-26 17:52:37 -08:00
commit a8b2376e80
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/ident/geoip
View File

@ -327,8 +327,11 @@ sub open_geoip_db {
# can't think of a good reason to load country if city data is present # can't think of a good reason to load country if city data is present
if (!$self->{_geoip_city}) { if (!$self->{_geoip_city}) {
$self->log(LOGDEBUG, "using default db"); $self->log(LOGDEBUG, "using default db");
$self->{_geoip} = Geo::IP->new(); # loads default Country DB eval { $self->{_geoip} = Geo::IP->new(); }; # loads default Country DB
warn "Missing GeoIP Country data!\n" if ! $self->{_geoip}; if (!$self->{_geoip}) {
my $err = $@ || 'Unknown error';
warn "Missing GeoIP Country data:$err\n";
}
} }
} }