X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=13de00bb983aae903bfce2f9ee0f9b4ad5f6b5bc;hb=redirection-security-retry;hp=f9cae7ab2aecfab5a03b13d5403cb29212fc51c6;hpb=eb0d3cdea253b57559d190821a4f11b6265661ab;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index f9cae7a..13de00b 100755 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -126,7 +126,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90064'; +our $VERSION = '5.90065'; sub import { my ( $class, @arguments ) = @_; @@ -1252,11 +1252,9 @@ EOF } $class->setup_finalize; - - # Turn autoflush back off once setup is finished. - # TODO: this is being done purely for Static::Simple (legacy API), and has been suggested by - # mst to be removed and require/update Static::Simple to set this flag itself - $class->log->autoflush(0) if ($class->log->can('autoflush')); + + # Flush the log for good measure (in case something turned off 'autoflush' early) + $class->log->_flush() if $class->log->can('_flush'); return $class || 1; # Just in case someone named their Application 0... } @@ -2950,9 +2948,6 @@ sub setup_log { unless ( $class->log ) { $class->log( Catalyst::Log->new(keys %levels) ); } - - # Turn on autoflush by default: - $class->log->autoflush(1) if ($class->log->can('autoflush')); if ( $levels{debug} ) { Class::MOP::get_metaclass_by_name($class)->add_method('debug' => sub { 1 }); @@ -3958,6 +3953,8 @@ t0m: Tomas Doran Ulf Edvinsson +vanstyn: Henry Van Styn + Viljo Marrandi C Will Hawes C