[Jifty-commit] r6923 - in jifty/trunk: lib/Jifty/Plugin

Thu Apr 30 02:39:38 EDT 2009

Author: sunnavy
Date: Thu Apr 30 02:39:37 2009
New Revision: 6923

Modified:
   jifty/trunk/lib/Jifty/Plugin/Config.pm
   jifty/trunk/share/plugins/Jifty/Plugin/Config/web/templates/__jifty/config/restart.html

Log:
add wait_seconds class attribute for config plugin

Modified: jifty/trunk/lib/Jifty/Plugin/Config.pm
==============================================================================

--- jifty/trunk/lib/Jifty/Plugin/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Config.pm	Thu Apr 30 02:39:37 2009
@@ -3,7 +3,8 @@
 
 package Jifty::Plugin::Config;
 use base qw/Jifty::Plugin Class::Data::Inheritable/;
-__PACKAGE__->mk_classdata( 'after_restart_url' );
+__PACKAGE__->mk_classdata( after_restart_url => '/' );
+__PACKAGE__->mk_classdata( wait_seconds => 5 );
 
 =head2 NAME
 
@@ -16,6 +17,7 @@
   Plugins:
     - Config:
         after_restart_url: '/'
+        wait_seconds: 5
 
 =head2  DESCRIPTION
 
@@ -30,7 +32,9 @@
 
 =head2 init
 
-set after_restart_url, default is '/'
+set after_restart_url and wait_seconds, default is '/' and 5, respectively
+after_restart_url is the url we will redirect to after restart
+wait_seconds are the seconds that we wait for before redirecting
 
 =cut
 
@@ -38,7 +42,10 @@
     my $self = shift;
     my %opt = @_;
     if ( $opt{after_restart_url} ) {
-        __PACKAGE__->after_restart_url( $opt{after_restart_url} || '/' );
+        __PACKAGE__->after_restart_url( $opt{after_restart_url} );
+    }
+    if ( $opt{wait_seconds} ) {
+        __PACKAGE__->wait_seconds( $opt{wait_seconds} );
     }
 }
 

Modified: jifty/trunk/share/plugins/Jifty/Plugin/Config/web/templates/__jifty/config/restart.html
==============================================================================
--- jifty/trunk/share/plugins/Jifty/Plugin/Config/web/templates/__jifty/config/restart.html	(original)
+++ jifty/trunk/share/plugins/Jifty/Plugin/Config/web/templates/__jifty/config/restart.html	Thu Apr 30 02:39:37 2009
@@ -2,11 +2,17 @@
 <html>
 <head>
 <title><% _('restarting' ) %></title>
-<meta http-equiv="refresh" content="5;url=<% Jifty::Plugin::Config->after_restart_url %>" />
+<meta http-equiv="refresh" content="<% $seconds %>;url=<% $url %>" />
 </head>
 <body>
-<h1>please wait for 5 seconds so the server can restart</h1>
+<h1>please wait for <% $seconds %> seconds so the server can restart,
+    then we'll redirect to <a href="<% $url %>">here</a></h1>
 </body>
 </html>
 % Jifty->handler->buffer->flush_output();
 % $Jifty::SERVER->restart;
+
+<%init>
+my $seconds = Jifty::Plugin::Config->wait_seconds;
+my $url = Jifty::Plugin::Config->after_restart_url;
+</%init>
