[Jifty-commit] r2108 - in jifty/trunk: lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri Nov  3 17:32:10 2006
New Revision: 2108

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Script/FastCGI.pm

Log:
 r29756 at pinglin:  jesse | 2006-11-03 17:31:23 -0500
 * Removed support for Devel::Gladiator. It was very, very beta and caused server processes to end up as zombies


Modified: jifty/trunk/lib/Jifty/Script/FastCGI.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/FastCGI.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/FastCGI.pm	Fri Nov  3 17:32:10 2006
@@ -48,10 +48,7 @@
 
 If you have MaxRequests options under FastCGI in your config.yml, or
 commandline option C<--maxrequests=N> assigned, the fastcgi process
-will exit after serving N requests.  Additionally, if you have
-Gladiator options under FastCGI in your config.yml enabled, Jifty will
-log your memory usable summary when the child is exiting.  You will
-need to Install L<Devel::Gladiator> for this to be useful.
+will exit after serving N requests. 
 
 =head2 options
 
@@ -60,7 +57,6 @@
 sub options {
     (
         'maxrequests=i' => 'maxrequests',
-        'gladitator' => 'gladiator'
     );
 }
 
@@ -70,18 +66,11 @@
 
 =cut
 
-my $gladiator;
-
-BEGIN {
-    $gladiator = eval { require Devel::Gladiator; 1 };
-}
-
 sub run {
     my $self = shift;
     Jifty->new();
     my $conf = Jifty->config->framework('Web')->{'FastCGI'} || {};
     $self->{maxrequests} ||= $conf->{MaxRequests};
-    $self->{gladiator} ||= $conf->{Gladiator};
 
     my $requests = 0;
     while ( my $cgi = CGI::Fast->new ) {
@@ -96,9 +85,6 @@
         }
         Jifty->handler->handle_request( cgi => $cgi );
 	if ($self->{maxrequests} && ++$requests >= $self->{maxrequests}) {
-	    if ($self->{gladiator} && $gladiator) {
-		Jifty->log->info( Devel::Gladiator::arena_table() );
-	    }
 	    exit 0;
 	}
     }