Misc tweaks per mst

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 6bc7e3d..fef863b 100755 (executable)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -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(undef) 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 <bobtfish@bobtfish.net>
 
 Ulf Edvinsson
 
+vanstyn: Henry Van Styn <vanstyn@cpan.org>
+
 Viljo Marrandi C<vilts@yahoo.com>
 
 Will Hawes C<info@whawes.co.uk>