This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch perl-iproto-async has been updated
via 681118717c1a02a948a8997433325095ffeebb2f (commit)
from 493a2335d3538984190c56f34579d9a4f539a5ab (commit)
Summary of changes:
mod/silverbox/client/perl/lib/MR/IProto.pm | 2 +-
.../client/perl/lib/MR/IProto/Connection/Sync.pm | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
commit 681118717c1a02a948a8997433325095ffeebb2f
Author: Aleksey Mashanov <[email protected]>
Date: Wed Dec 1 15:35:49 2010 +0300
Removing location information from error messages
diff --git a/mod/silverbox/client/perl/lib/MR/IProto.pm
b/mod/silverbox/client/perl/lib/MR/IProto.pm
index 0d5f293..12c20dc 100644
--- a/mod/silverbox/client/perl/lib/MR/IProto.pm
+++ b/mod/silverbox/client/perl/lib/MR/IProto.pm
@@ -310,7 +310,7 @@ sub Chat1 {
my $message = @_ == 1 ? shift : { @_ };
my $data;
return eval { $data = $self->send($message); 1 } ? { ok => $data }
- : { fail => $@, timeout => $! == Errno::ETIMEDOUT };
+ : { fail => $@ =~ /^(.*?) at \S+ line \d+/s ? $1 : $@, timeout => $!
== Errno::ETIMEDOUT };
}
sub SetTimeout {
diff --git a/mod/silverbox/client/perl/lib/MR/IProto/Connection/Sync.pm
b/mod/silverbox/client/perl/lib/MR/IProto/Connection/Sync.pm
index a95e321..5598bb6 100644
--- a/mod/silverbox/client/perl/lib/MR/IProto/Connection/Sync.pm
+++ b/mod/silverbox/client/perl/lib/MR/IProto/Connection/Sync.pm
@@ -81,13 +81,14 @@ sub send {
$callback->($resp_msg, $resp_payload);
}
else {
+ my $error = $@ =~ /^(.*?) at \S+ line \d+/s ? $1 : $@;
+ $self->_debug(0, "error: $error");
$! = Errno::ETIMEDOUT if $! == Errno::EINPROGRESS; # Hack over
IO::Socket behaviour
if($self->_has_socket()) {
close($self->_socket);
$self->_clear_socket();
}
$self->server->active(0);
- my $error = $@;
$self->_recv_finished($sync, undef, undef, $error);
$callback->(undef, undef, $error);
}
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
