use base 'Catalyst::Base';
use UNIVERSAL::require;
use Catalyst::Log;
+use Text::ASCIITable;
__PACKAGE__->mk_classdata($_) for qw/engine log/;
$caller->log->debug('Debug messages enabled');
}
- my $engine ='Catalyst::Engine::CGI';
+ my $engine = 'Catalyst::Engine::CGI';
if ( $ENV{MOD_PERL} ) {
require mod_perl;
if ( $mod_perl::VERSION >= 1.99 ) {
- $engine ='Catalyst::Engine::Apache::MP2';
+ $engine = 'Catalyst::Engine::Apache::MP2';
}
else {
- $engine ='Catalyst::Engine::Apache::MP1';
+ $engine = 'Catalyst::Engine::Apache::MP1';
}
}
else {
my $plugin = "Catalyst::Plugin::$_";
- # Plugin caller should be our application class
- eval "package $caller; require $plugin";
+ $plugin->require;
+
if ($@) {
$caller->log->error(qq/Couldn't load plugin "$plugin", "$@"/);
}
else {
- push @plugins, " $plugin";
+ push @plugins, " + $plugin";
no strict 'refs';
push @{"$caller\::ISA"}, $plugin;
}
}
}
- $caller->log->debug( 'Loaded plugins', @plugins )
+ my $t = Text::ASCIITable->new;
+ $t->setCols('Class');
+ $t->addRow($_) for @plugins;
+ $caller->log->debug( 'Loaded plugins', $t->draw )
if ( @plugins && $caller->debug );
# Engine