mention reactor class in warning

mojolicious · Oct 29, 2013 · 7e172e7 · 7e172e7
1 parent 649ac29
commit 7e172e7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 use Mojo::IOLoop::Stream;
 use Mojo::Reactor::Poll;
 use Mojo::Util qw(md5_sum steady_time);
-use Scalar::Util 'weaken';
+use Scalar::Util qw(blessed weaken);
 
 use constant DEBUG => $ENV{MOJO_IOLOOP_DEBUG} || 0;
 
@@ -23,7 +23,7 @@ has reactor         => sub {
   my $class = Mojo::Reactor::Poll->detect;
   warn "-- Reactor initialized ($class)\n" if DEBUG;
   my $reactor = $class->new;
-  $reactor->on(error => sub { warn $_[1] });
+  $reactor->on(error => sub { warn "@{[blessed $_[0]]}: $_[1]" });
   return $reactor;
 };
 

diff --git a/lib/Mojo/Reactor/EV.pm b/lib/Mojo/Reactor/EV.pm
@@ -49,8 +49,8 @@ sub watch {
 sub _io {
   my ($self, $fd, $w, $revents) = @_;
   my $io = $self->{io}{$fd};
-  $self->_sandbox('read', $io->{cb}, 0) if EV::READ &$revents;
-  $self->_sandbox('write', $io->{cb}, 1)
+  $self->_sandbox('Read', $io->{cb}, 0) if EV::READ &$revents;
+  $self->_sandbox('Write', $io->{cb}, 1)
     if EV::WRITE &$revents && $self->{io}{$fd};
 }
 
@@ -62,7 +62,7 @@ sub _timer {
   weaken $self;
   $self->{timers}{$id}{watcher} = EV::timer(
     $after => $after => sub {
-      $self->_sandbox("timer $id", $self->{timers}{$id}{cb});
+      $self->_sandbox("Timer $id", $self->{timers}{$id}{cb});
       delete $self->{timers}{$id} unless $recurring;
     }
   );

diff --git a/lib/Mojo/Reactor/Poll.pm b/lib/Mojo/Reactor/Poll.pm
@@ -42,9 +42,9 @@ sub one_tick {
     # I/O
     if (keys %{$self->{io}}) {
       $poll->poll($timeout);
-      ++$i and $self->_sandbox('read', $self->{io}{fileno $_}{cb}, 0)
+      ++$i and $self->_sandbox('Read', $self->{io}{fileno $_}{cb}, 0)
         for $poll->handles(POLLIN | POLLHUP | POLLERR);
-      ++$i and $self->_sandbox('write', $self->{io}{fileno $_}{cb}, 1)
+      ++$i and $self->_sandbox('Write', $self->{io}{fileno $_}{cb}, 1)
         for $poll->handles(POLLOUT);
     }
 
@@ -63,7 +63,7 @@ sub one_tick {
       # Normal timer
       else { $self->remove($id) }
 
-      ++$i and $self->_sandbox("timer $id", $t->{cb}) if $t->{cb};
+      ++$i and $self->_sandbox("Timer $id", $t->{cb}) if $t->{cb};
     }
   }
 
@@ -106,8 +106,7 @@ sub _poll { shift->{poll} ||= IO::Poll->new }
 
 sub _sandbox {
   my ($self, $event, $cb) = (shift, shift, shift);
-  $self->emit(error => "Reactor $event failed: $@")
-    unless eval { $self->$cb(@_); 1 };
+  eval { $self->$cb(@_); 1 } or $self->emit(error => "$event failed: $@");
 }
 
 sub _timer {

diff --git a/t/mojo/ioloop.t b/t/mojo/ioloop.t
@@ -264,7 +264,7 @@ is $loop->max_accepts, 1, 'right value';
   my $loop = Mojo::IOLoop->new;
   $loop->timer(0 => sub { die 'Bye!' });
   $loop->start;
-  like $err, qr/Bye!/, 'right error';
+  like $err, qr/^MyReactor:.*Bye!/, 'right error';
 }
 
 # Defaults