From a1144ecbf9cd257f5688474979518180ec801fbb Mon Sep 17 00:00:00 2001
From: Jared Johnson <jjohnson@efolder.net>
Date: Thu, 26 Feb 2015 17:07:35 -0600
Subject: [PATCH] Revert "Revert "Don't crash QP when GeoIP data is missing""

---
 plugins/ident/geoip | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/ident/geoip b/plugins/ident/geoip
index b3672af..36499bc 100644
--- a/plugins/ident/geoip
+++ b/plugins/ident/geoip
@@ -327,8 +327,11 @@ 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");
-        $self->{_geoip} = Geo::IP->new();    # loads default Country DB
-        warn "Missing GeoIP Country data!\n" if ! $self->{_geoip};
+        eval { $self->{_geoip} = Geo::IP->new(); };   # loads default Country DB
+        if (!$self->{_geoip}) {
+            my $err = $@ || 'Unknown error';
+            warn "Missing GeoIP Country data:$err\n";
+        }
     }
 }