[ViewVC] Diff of: cvs/AnyEvent-FCP/FCP.pm

Comparing AnyEvent-FCP/FCP.pm (file contents):
Revision 1.18 by root, Thu Dec 3 19:07:57 2015 UTC vs.
Revision 1.19 by root, Tue Jun 7 18:53:23 2016 UTC

          # we only carve out whole messages here
          while ($hdl->{rbuf} =~ /\012(EndMessage|Data)\012/) {
             # remember end marker
             $rdata = $1 eq "Data"
                or $1 eq "EndMessage"
-               or die "protocol error, expected message end, got $1\n";
+               or return $self->fatal ("protocol error, expected message end, got $1\n");
             my @lines = split /\012/, substr $hdl->{rbuf}, 0, $-[0];
             substr $hdl->{rbuf}, 0, $+[0], ""; # remove pkg
       };
       $self->{hdl} = new AnyEvent::Handle
          connect  => [$self->{host} => $self->{port}],
          timeout  => $self->{timeout},
+         on_read  => $on_read,
+         on_eof   => $self->{on_eof},
          on_error => sub {
-            warn "$self->{host}: $_[2]\n";#d#
+            $self->fatal ($_[2]);
-            exit 1;
          },
-         on_read  => $on_read,
-         on_eof   => $self->{on_eof} || sub { },
       ;
       Scalar::Util::weaken ($self->{hdl}{fcp} = $self);
    }
       name             => $self->{name},
       expected_version => "2.0",
    );
    $self
+}
+sub fatal {
+   my ($self, $msg) = @_;
+   $self->{hdl}->shutdown;
+   delete $self->{kw};
+   if ($self->{on_error}) {
+      $self->{on_error}->($msg);
+   } else {
+      die $msg;
+   }
 }
 sub identifier {
    $_[0]{prefix} . ++$_[0]{idseq}
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines