From 6f38bdf5ad2dc1ee213b22deb3f2d16a5050dcdf Mon Sep 17 00:00:00 2001 From: Jared Johnson Date: Thu, 26 Feb 2015 17:05:52 -0600 Subject: [PATCH] Revert "Don't crash QP when GeoIP data is missing" --- plugins/ident/geoip | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/ident/geoip b/plugins/ident/geoip index 36499bc..b3672af 100644 --- a/plugins/ident/geoip +++ b/plugins/ident/geoip @@ -327,11 +327,8 @@ sub open_geoip_db { # can't think of a good reason to load country if city data is present if (!$self->{_geoip_city}) { $self->log(LOGDEBUG, "using default db"); - eval { $self->{_geoip} = Geo::IP->new(); }; # loads default Country DB - if (!$self->{_geoip}) { - my $err = $@ || 'Unknown error'; - warn "Missing GeoIP Country data:$err\n"; - } + $self->{_geoip} = Geo::IP->new(); # loads default Country DB + warn "Missing GeoIP Country data!\n" if ! $self->{_geoip}; } }