[Jifty-commit] r7239 - jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action

Jifty commits jifty-commit at lists.jifty.org
Thu Jun 11 15:40:14 EDT 2009


Author: sartak
Date: Thu Jun 11 15:40:14 2009
New Revision: 7239

Modified:
   jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm

Log:
Handle dies on ->connect error, false is an acceptable return value

Modified: jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SetupWizard/Action/TestDatabaseConnectivity.pm	Thu Jun 11 15:40:14 2009
@@ -49,7 +49,12 @@
     my $handle = Jifty::DBI::Handle->new;
     my $ok = eval {
         local $SIG{__DIE__};
+
+        # Connect returns undef if there's already a connection, so we
+        # only report failure to connect if an exception was thrown
         $handle->connect(%args);
+
+        1;
     };
     my $error = $@;
 


More information about the Jifty-commit mailing list