Changeset 9638

Timestamp:

04/17/08 22:56:54 (5 years ago)

Author:

tokuhirom

Message:

logger も component にしてみるよ

Location:

lang/perl/Moxy/branches/CC/lib

Files:

• Moxy.pm (modified) (4 diffs)
• Moxy/Component/Logger.pm (added)

lang/perl/Moxy/branches/CC/lib/Moxy.pm

@@ -12 +12 @@
 use UNIVERSAL::require;
 use Carp;
-use Log::Dispatch;
 use Scalar::Util qw/blessed/;
-my $TERM_ANSICOLOR_ENABLED = eval { use Term::ANSIColor; 1; };
 
-__PACKAGE__->load_components(qw/UAInfo/);
+__PACKAGE__->load_components(qw/UAInfo Logger/);
 
 sub new {
@@ -23 +21 @@
     my $self = bless { config => $config, }, $class;
 
-    $self->{logger} = Log::Dispatch->new;
-
     $self->load_plugins;
 
     $self->_init_storage;
-
-    $self->_init_logger;
 
     if (not $self->is_loaded(qr{::Server})) {
@@ -68 +62 @@
     my ($self, $plugin) = @_;
 
-    $self->log(debug => "load plugin: $plugin->{module}");
-
     my $module = "Moxy::Plugin::" . $plugin->{module};
     $module->require or die $@;
@@ -97 +89 @@
 
 sub storage { shift->{storage} }
-
-# -------------------------------------------------------------------------
-
-sub _init_logger {
-    my ($self, ) = @_;
-
-    for my $target (@{$self->config->{global}->{log}->{targets}}) {
-        $target->{module}->use or die $@;
-        $self->{logger}->add( $target->{module}->new( %{ $target->{conf} } ) );
-    }
-}
-
-sub log {
-    my ($self, $level, $msg, %opt) = @_;
-
-    # hack to get the original caller as Plugin or Server
-    my $caller = $opt{caller};
-    unless ($caller) {
-        my $i = 0;
-        while (my $c = caller($i++)) {
-            last if $c !~ /Plugin/;
-            $caller = $c;
-        }
-        $caller ||= caller(0);
-    }
-
-    chomp($msg);
-    if ( $self->config->{global}->{log}->{encoding} ) {
-        $msg = Encode::decode_utf8($msg) unless utf8::is_utf8($msg);
-        $msg = Encode::encode( $self->config->{global}->{log}->{encoding}, $msg );
-    }
-
-    $self->{logger}->log(level => $level, message => "$caller [$level] $msg\n");
-}
 
 # -------------------------------------------------------------------------