Misc tweaks per mst

Log still flushed at the end of setup + Catalyst::Log::_log() returns 1

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 2732670..fef863b 100755 (executable)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1250,9 +1250,12 @@ EOF
         $class->log->warn($class . "->config->{case_sensitive} is set.");
         $class->log->warn("This setting is deprecated and planned to be removed in Catalyst 5.81.");
     }
-    
+
     $class->setup_finalize;
 
+    # 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...
 }
 
@@ -2945,7 +2948,7 @@ sub setup_log {
     unless ( $class->log ) {
         $class->log( Catalyst::Log->new(keys %levels) );
     }
-    
+
     if ( $levels{debug} ) {
         Class::MOP::get_metaclass_by_name($class)->add_method('debug' => sub { 1 });
         $class->log->debug('Debug messages enabled');

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index ee9a7e5..e70197f 100755 (executable)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -108,9 +108,8 @@ sub _log {
     my $self    = shift;
     my $level   = shift;
     my $message = join( "\n", @_ );
-    my $ret;
     if ($self->can('_has_psgi_logger') and $self->_has_psgi_logger) {
-        $ret = $self->_psgi_logger->({
+        $self->_psgi_logger->({
                 level => $level,
                 message => $message,
             });
@@ -118,12 +117,12 @@ sub _log {
         $message .= "\n" unless $message =~ /\n$/;
         my $body = $self->_body;
         $body .= sprintf( "[%s] %s", $level, $message );
-        $ret = $self->_body($body);
+        $self->_body($body);
     }
     if( $self->autoflush && !$self->abort ) {
       $self->_flush;
     }
-    return $ret;
+    return 1;
 }
 
 sub _flush {