[Jifty-commit] r7224 - in jifty/trunk/lib/Jifty/Plugin/SetupWizard: Action

[Jifty commits]

Author: sartak
Date: Wed Jun 10 20:24:14 2009
New Revision: 7224

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

Log:
Improve robustness

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	Wed Jun 10 20:24:14 2009
@@ -40,7 +40,11 @@
     my $self = shift;
 
     my $handle = Jifty::DBI::Handle->new;
-    my $ok = eval { $handle->connect(%{ $self->argument_values }) };
+    my $ok = eval {
+        local $SIG{__DIE__};
+        $handle->connect(%{ $self->argument_values })
+    };
+    warn $@ if $@;
 
     return $ok;
 }

Modified: jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SetupWizard/View.pm	Wed Jun 10 20:24:14 2009
@@ -181,6 +181,11 @@
         name => 'database_details',
         path => "/__jifty/admin/setupwizard/database/$current_driver",
     );
+
+    render_region(
+        name => 'test_connectivity',
+        path => '/__jifty/admin/setupwizard/database/test_connectivity_button',
+    );
 };
 
 template '/__jifty/admin/setupwizard/database/SQLite' => sub {
@@ -235,6 +240,27 @@
     );
 };
 
+template '/__jifty/admin/setupwizard/database/test_connectivity_button' => sub {
+    hyperlink(
+        label => _("Test connectivity"),
+        onclick => {
+            # Submit all actions
+            submit => undef,
+
+            # Actually test connectivity
+            replace_with => '/__jifty/admin/setupwizard/database/test_connectivity',
+        },
+    );
+};
+
+template '/__jifty/admin/setupwizard/database/test_connectivity' => sub {
+    my $action = Jifty::Plugin::SetupWizard::Action::TestDatabaseConnectivity->new;
+    $action->validate;
+    $action->run;
+
+    show '/__jifty/admin/setupwizard/database/test_connectivity_button';
+};
+
 template '/__jifty/admin/setupwizard/web' => sub {
     p { _("You may change web server settings.") };