[Jifty-commit] r640 - jifty/trunk/lib

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Wed Mar  1 04:03:55 2006
New Revision: 640

Modified:
   /   (props changed)
   jifty/trunk/lib/Jifty.pm
   jifty/trunk/lib/Jifty/Dispatcher.pm
   jifty/trunk/lib/Jifty/Handler.pm

Log:
 r24818 at truegrounds:  jesse | 2006-03-01 03:38:40 -0500
 * A bit of rejiggering of the way the Jifty Handler sets things up to only set up a dispatcher once.


Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm	(original)
+++ jifty/trunk/lib/Jifty.pm	Wed Mar  1 04:03:55 2006
@@ -104,11 +104,12 @@
     __PACKAGE__->config( Jifty::Config->new() );
 
     __PACKAGE__->logger( Jifty::Logger->new( $args{'logger_component'} ) );
+   # Get a classloader set up
+   Jifty::ClassLoader->new->require;
+
     __PACKAGE__->dispatcher(Jifty::Dispatcher->new());
     __PACKAGE__->handler(Jifty::Handler->new());
 
-   # Get a classloader set up
-   Jifty::ClassLoader->new->require;
 
    # Let's get the database rocking and rolling
    __PACKAGE__->setup_database_connection(%args);

Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Wed Mar  1 04:03:55 2006
@@ -286,6 +286,7 @@
     my @args  = grep { !/^-[Bb]ase/ } @_;
 
     no strict 'refs';
+    no warnings 'once';
     for (qw(RULES RULES_SETUP RULES_CLEANUP)) {
         @{ $pkg . '::' . $_ } = ();
     }

Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/Handler.pm	Wed Mar  1 04:03:55 2006
@@ -48,6 +48,8 @@
     };
 
 
+    $self->dispatcher(Jifty->config->framework('ApplicationClass')."::Dispatcher");
+    Jifty::Util->require($self->dispatcher);
     return $self;
 }
 
@@ -151,12 +153,8 @@
 
     Jifty->log->debug("Received request for ".Jifty->web->request->path);
 
-    $self->mason(Jifty::MasonHandler->new(
-        $self->mason_config,
-    ));
 
-    $self->dispatcher(Jifty->config->framework('ApplicationClass')."::Dispatcher");
-    Jifty::Util->require($self->dispatcher);
+    $self->mason(Jifty::MasonHandler->new( $self->mason_config,));
     $self->dispatcher->handle_request();
 
     $self->cleanup_request();