Merge branch 'master' of https://github.com/jamesrusso/Dancer-Plugin-…

…Database into jamesrusso-master
nfg · Jan 24, 2016 · 0a1bc36 · 0a1bc36
2 parents e14f0ba + 3ba8241
commit 0a1bc36
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Shared/lib/Dancer/Plugin/Database/Core.pm b/Shared/lib/Dancer/Plugin/Database/Core.pm
@@ -328,8 +328,16 @@ sub _get_connection {
 sub _check_connection {
     my $dbh = shift;
     return unless $dbh;
-    if ($dbh->{Active} && (my $result = $dbh->ping)) {
-        if (int($result)) {
+    if ($dbh->{Active}) { 
+        my $result = undef;
+
+        eval { 
+             $result = $dbh->ping;
+        };
+
+        return 0 if $@;
+
+	    if (int($result)) {
             # DB driver itself claims all is OK, trust it:
             return 1;
         } else {