reconnect to redis if the connection went away

[perl-Redis.git] / lib / Redis.pm

diff --git a/lib/Redis.pm b/lib/Redis.pm
index 9fbbab8..e267ec4 100644 (file)
--- a/lib/Redis.pm
+++ b/lib/Redis.pm
@@ -6,6 +6,7 @@ use strict;
 use IO::Socket::INET;
 use Data::Dumper;
 use Carp qw/confess/;
+use Encode;
 
 =head1 NAME
 
@@ -13,14 +14,14 @@ Redis - perl binding for Redis database
 
 =cut
 
-our $VERSION = '0.0801';
+our $VERSION = '1.2001';
 
 
 =head1 DESCRIPTION
 
 Pure perl bindings for L<http://code.google.com/p/redis/>
 
-This version support git version 0.08 or later of Redis available at
+This version supports protocol 1.2 or later of Redis available at
 
 L<git://github.com/antirez/redis>
 
@@ -77,6 +78,8 @@ our $AUTOLOAD;
 sub AUTOLOAD {
        my $self = shift;
 
+       use bytes;
+
        my $sock = $self->{sock} || die "no server connected";
 
        my $command = $AUTOLOAD;
@@ -114,7 +117,18 @@ sub AUTOLOAD {
                return 1;
        }
 
-       my $result = <$sock> || die "can't read socket: $!";
+       my $result = <$sock>;
+       if ( !$result ) {
+               $self->{sock} = $sock = IO::Socket::INET->new(
+                       PeerAddr => $self->{server},
+                       Proto => 'tcp',
+               ) || die $!;
+
+               print $sock $send;
+
+               $result = <$sock> || die "can't read socket: $!";
+       }
+       Encode::_utf8_on($result);
        warn "<< $result" if $self->{debug};
        my $type = substr($result,0,1);
        $result = substr($result,1,-2);
@@ -154,6 +168,7 @@ sub __read_bulk {
        my $v;
        if ( $len > 0 ) {
                read($self->{sock}, $v, $len) || die $!;
+               Encode::_utf8_on($v);
                warn "<< ",Dumper($v),$/ if $self->{debug};
        }
        my $crlf;
@@ -367,6 +382,14 @@ See also L<Redis::List> for tie interface.
 
   my $info_hash = $r->info;
 
+=head1 ENCODING
+
+Since Redis knows nothing about encoding, we are forcing utf-8 flag on all data received from Redis.
+This change is introduced in 1.2001 version.
+
+This allows us to round-trip utf-8 encoded characters correctly, but might be problem if you push
+binary junk into Redis and expect to get it back without utf-8 flag turned on.
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic, C<< <dpavlin at rot13.org> >>
@@ -417,7 +440,7 @@ L<http://search.cpan.org/dist/Redis>
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2009 Dobrica Pavlinusic, all rights reserved.
+Copyright 2009-2010 Dobrica Pavlinusic, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.