Fixed table debug messages to be more portable

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index f2bcba3..4e63058 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -10,6 +10,7 @@ use HTML::Entities;
 use HTTP::Headers;
 use Time::HiRes qw/gettimeofday tv_interval/;
 use Text::ASCIITable;
+use Catalyst::Exception;
 use Catalyst::Request;
 use Catalyst::Request::Upload;
 use Catalyst::Response;
@@ -520,7 +521,7 @@ sub prepare {
             my $value = defined($param) ? $param : '';
             $t->addRow( $key, $value );
         }
-        $c->log->debug( 'Parameters are', $t->draw );
+        $c->log->debug( "Parameters are:\n" . $t->draw );
     }
 
     return $c;
@@ -693,7 +694,7 @@ sub setup {
         $t->setCols('Class');
         $t->setColWidth( 'Class', 75, 1 );
         $t->addRow($_) for sort keys %{ $self->components };
-        $self->log->debug( 'Loaded components', $t->draw )
+        $self->log->debug( "Loaded components:\n" . $t->draw )
           if ( @{ $t->{tbl_rows} } );
     }
 
@@ -732,8 +733,12 @@ sub setup_components {
         eval { $instance = $component->new( $context, $config ); };
 
         if ( my $error = $@ ) {
+            
             chomp $error;
-            die qq/Couldn't instantiate component "$component", "$error"/;
+            
+            Catalyst::Exception->throw( 
+                message => qq/Couldn't instantiate component "$component", "$error"/
+            );
         }
 
         return $instance;
@@ -752,8 +757,12 @@ sub setup_components {
     };
 
     if ( my $error = $@ ) {
+        
         chomp $error;
-        die qq/Couldn't load components "$error"/;
+        
+        Catalyst::Exception->throw( 
+            message => qq/Couldn't load components "$error"/ 
+        );
     }
 
     for my $component ( $self->_components($self) ) {