Removed "on_connect_error" callback

Author: iph0

lib/AnyEvent/RipeRedis.pm

@@ -140,7 +140,6 @@ sub new {
   $self->{handle_params} = $params{handle_params} || {};
   $self->{on_connect}    = $params{on_connect};
   $self->{on_disconnect} = $params{on_disconnect};
-  $self->{on_connect_error} = $params{on_connect_error};
 
   $self->connection_timeout( $params{connection_timeout} );
   $self->read_timeout( $params{read_timeout} );
@@ -232,9 +231,7 @@ sub on_error {
     };
   }
 
-  foreach my $name ( qw( utf8 reconnect on_connect on_disconnect
-      on_connect_error ) )
-  {
+  foreach my $name ( qw( utf8 reconnect on_connect on_disconnect ) ) {
     *{$name} = sub {
       my $self = shift;
 
@@ -962,12 +959,7 @@ sub _abort {
     my $err_msg  = $err->message;
     my $err_code = $err->code;
 
-    if ( defined $self->{on_connect_error} && $err_code == E_CANT_CONN ) {
-      $self->{on_connect_error}->($err);
-    }
-    else {
-      $self->{on_error}->($err);
-    }
+    $self->{on_error}->($err);
 
     if ( %channels && $err_code != E_CONN_CLOSED_BY_CLIENT ) {
       foreach my $name ( keys %channels ) {
@@ -1124,12 +1116,6 @@ Requires Redis 1.2 or higher, and any supported event loop.
       # handling...
     },
 
-    on_connect_error => sub {
-      my $err = shift;
-
-      # error handling...
-    },
-
     on_error => sub {
       my $err = shift;
 
@@ -1171,9 +1157,9 @@ Enabled by default.
 =item connection_timeout => $fractional_seconds
 
 Specifies connection timeout. If the client could not connect to the server
-after specified timeout, the C<on_connect_error> callback is called with the
-C<E_CANT_CONN> error, or if it not specified, the C<on_error> callback is
-called. The timeout specifies in seconds and can contain a fractional part.
+after specified timeout, the C<on_error> callback is called with the
+C<E_CANT_CONN> error. The timeout specifies in seconds and can contain a
+fractional part.
 
   connection_timeout => 10.5,
 
@@ -1244,18 +1230,10 @@ reason.
 
 Not set by default.
 
-=item on_connect_error => $cb->( $err )
-
-The C<on_connect_error> callback is called, when the connection could not be
-established. If this callback isn't specified, the C<on_error> callback is
-called.
-
-Not set by default.
-
 =item on_error => $cb->( $err )
 
 The C<on_error> callback is called when occurred an error, which was affected
-on whole client (e. g. connection error or authentication error). Also the
+on entire client (e. g. connection error or authentication error). Also the
 C<on_error> callback is called on command errors if the command callback is not
 specified. If the C<on_error> callback is not specified, the client just print
 an error messages to C<STDERR>.
@@ -1859,10 +1837,6 @@ Get or set the C<on_connect> callback.
 
 Get or set the C<on_disconnect> callback.
 
-=head2 on_connect_error( [ $callback ] )
-
-Get or set the C<on_connect_error> callback.
-
 =head2 on_error( [ $callback ] )
 
 Get or set the C<on_error> callback.

t/02-accessors.t

@@ -3,7 +3,7 @@ use strict;
 use warnings;
 
 use lib 't/tlib';
-use Test::More tests => 41;
+use Test::More tests => 37;
 use AnyEvent::RipeRedis qw( :err_codes );
 use AnyEvent::RipeRedis::Error;
 
@@ -23,12 +23,8 @@ my $REDIS = AnyEvent::RipeRedis->new(
     return 2;
   },
 
-  on_connect_error => sub {
-    return 3;
-  },
-
   on_error => sub {
-    return 4;
+    return 3;
   },
 );
 
@@ -41,7 +37,6 @@ can_ok( $REDIS, 'utf8' );
 can_ok( $REDIS, 'reconnect' );
 can_ok( $REDIS, 'on_connect' );
 can_ok( $REDIS, 'on_disconnect' );
-can_ok( $REDIS, 'on_connect_error' );
 can_ok( $REDIS, 'on_error' );
 
 t_host($REDIS);
@@ -54,7 +49,6 @@ t_min_reconnect_interval($REDIS);
 t_utf8($REDIS);
 t_on_connect($REDIS);
 t_on_disconnect($REDIS);
-t_on_connect_error($REDIS);
 t_on_error($REDIS);
 
 
@@ -203,31 +197,11 @@ sub t_on_disconnect {
   return;
 }
 
-sub t_on_connect_error {
-  my $redis = shift;
-
-  my $on_conn_error = $redis->on_connect_error;
-  is( $on_conn_error->(), 3, q{get "on_connect_error" callback} );
-
-  $redis->on_connect_error(undef);
-  is( $redis->on_connect_error, undef,
-      q{disable "on_connect_error" callback} );
-
-  $redis->on_connect_error(
-    sub {
-      return 7;
-    }
-  );
-  is( $redis->on_connect_error->(), 7, q{set "on_connect_error" callback} );
-
-  return;
-}
-
 sub t_on_error {
   my $redis = shift;
 
   my $on_error = $redis->on_error;
-  is( $on_error->(), 4, q{get "on_error" callback} );
+  is( $on_error->(), 3, q{get "on_error" callback} );
 
   local %SIG;
   my $t_err;
@@ -245,11 +219,11 @@ sub t_on_error {
 
   $redis->on_error(
     sub {
-      return 8;
+      return 4;
     }
   );
 
-  is( $redis->on_error->(), 8, q{set "on_error" callback} );
+  is( $redis->on_error->(), 4, q{set "on_error" callback} );
 
   return;
 }

t/09-conn-errors.t

@@ -2,15 +2,13 @@ use 5.008000;
 use strict;
 use warnings;
 
-use Test::More tests => 45;
+use Test::More tests => 40;
 use AnyEvent::RipeRedis qw( :err_codes );
 use Net::EmptyPort qw( empty_port );
 use Scalar::Util qw( weaken );
 require 't/test_helper.pl';
 
-t_cant_connect_mth1();
-t_cant_connect_mth2();
-
+t_cant_connect();
 t_no_connection();
 t_reconnection();
 t_read_timeout();
@@ -21,54 +19,7 @@ t_premature_conn_close_mth2();
 t_subscription_lost();
 
 
-sub t_cant_connect_mth1 {
-  my $redis;
-  my $port = empty_port();
-
-  my $t_cli_err;
-  my $t_cmd_err;
-
-  AE::now_update();
-  ev_loop(
-    sub {
-      my $cv = shift;
-
-      $redis = AnyEvent::RipeRedis->new(
-        port               => $port,
-        connection_timeout => 3,
-        reconnect          => 0,
-
-        on_connect_error => sub {
-          $t_cli_err = shift;
-        },
-      );
-
-      $redis->ping(
-        sub {
-          my $reply  = shift;
-          $t_cmd_err = shift;
-
-          $cv->send;
-        }
-      );
-    },
-    0
-  );
-
-  my $t_npref = q{can't connect; 'on_connect_error' used};
-  isa_ok( $t_cli_err, 'AnyEvent::RipeRedis::Error' );
-  like( $t_cli_err->message, qr/^Can't connect to localhost:$port:/,
-      "$t_npref; client error message" );
-  isa_ok( $t_cmd_err, 'AnyEvent::RipeRedis::Error' );
-  like( $t_cmd_err->message,
-      qr/^Operation "ping" aborted: Can't connect to localhost:$port:/,
-      "$t_npref; command error message" );
-  is( $t_cmd_err->code, E_CANT_CONN, "$t_npref; command error code" );
-
-  return;
-}
-
-sub t_cant_connect_mth2 {
+sub t_cant_connect {
   my $redis;
   my $port = empty_port();
 
@@ -133,7 +84,7 @@ sub t_no_connection {
         connection_timeout => 3,
         reconnect          => 0,
 
-        on_connect_error => sub {
+        on_error => sub {
           $t_cli_err = shift;
         },
       );