fixed a few error reporting bugs in Mojo::IOLoop::Client and Mojo::IO…

…Loop::Server (closes #503)
mojolicious · Jun 10, 2013 · 060a775 · 060a775
1 parent 8e9af4f
commit 060a775
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,8 @@
 
+4.15  2013-06-11
+  - Fixed a few error reporting bugs in Mojo::IOLoop::Client and
+    Mojo::IOLoop::Server.
+
 4.14  2013-06-10
   - Improved url_for performance slightly.
   - Fixed bug where match attribute and render_later method were not hidden

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -56,7 +56,7 @@ sub _connect {
     $options{LocalAddr} = $args->{local_address} if $args->{local_address};
     $options{PeerAddr} =~ s/[\[\]]//g if $options{PeerAddr};
     my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
-    return $self->emit_safe(error => "Couldn't connect")
+    return $self->emit_safe(error => "Couldn't connect: $@")
       unless $self->{handle} = $handle = $class->new(%options);
 
     # Timeout

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -56,8 +56,8 @@ sub listen {
   my $handle;
   my $class = IPV6 ? 'IO::Socket::IP' : 'IO::Socket::INET';
   if (defined $fd) {
-    $handle = $class->new;
-    $handle->fdopen($fd, 'r') or croak "Can't open file descriptor $fd: $!";
+    $handle = $class->new_from_fd($fd, 'r')
+      or croak "Can't open file descriptor $fd: $!";
   }
 
   # New socket
@@ -71,7 +71,7 @@ sub listen {
       Type      => SOCK_STREAM
     );
     $options{LocalAddr} =~ s/[\[\]]//g;
-    $handle = $class->new(%options) or croak "Can't create listen socket: $!";
+    $handle = $class->new(%options) or croak "Can't create listen socket: $@";
     $fd = fileno $handle;
     $ENV{MOJO_REUSE} .= length $ENV{MOJO_REUSE} ? ",$reuse:$fd" : "$reuse:$fd";
   }

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -41,7 +41,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Top Hat';
-our $VERSION  = '4.14';
+our $VERSION  = '4.15';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/t/mojo/user_agent_online.t b/t/mojo/user_agent_online.t
@@ -89,7 +89,7 @@ ok $tx->error,       'has error';
 $tx = $ua->build_tx(GET => 'http://cdeabcdeffoobarnonexisting.com');
 $ua->start($tx);
 ok $tx->is_finished, 'transaction is finished';
-is $tx->error, "Couldn't connect", 'right error';
+like $tx->error, qr/^Couldn't connect/, 'right error';
 
 # Fresh user agent again
 $ua = Mojo::UserAgent->new;