support gearman admin text protocol with fake type TEXT

diff --git a/lib/MojoX/Gearman.pm b/lib/MojoX/Gearman.pm
index 25d84c2..512a641 100644 (file)
--- a/lib/MojoX/Gearman.pm
+++ b/lib/MojoX/Gearman.pm
@@ -77,6 +77,8 @@ sub connected {
 }
 
 my $packet_type = {
+       TEXT => -1,     # fake type for text protocol
+
        CAN_DO => 1,
 
        PRE_SLEEP => 4,
@@ -128,6 +130,13 @@ warn "XXX req ",dump(@_);
        my $response;
        my $cb = sub {
                my ( $self, $data ) = @_;
+
+               if ( substr($data,0,1) ne "\x00" ) {
+                       $self->res( $data );
+                       $self->stop;
+                       return;
+               }
+
                my ( $type, @data ) = $self->parse_packet($data);
                warn "# <<<< ", $nr2type->{$type}, " ",dump(@data);
 
@@ -168,7 +177,10 @@ warn "# <<<< ",$nr2type->{$type}, " ",dump $data;
 
 #      $data .= "\0" if $data;
        my $len = length($data);
-       my $message = pack("a4NN", "\0REQ", $packet_type->{$type}, length $data ) . $data;
+       my $message = $type ne 'TEXT'
+               ? pack("a4NN", "\0REQ", $packet_type->{$type}, length $data ) . $data
+               : "$data\r\n"
+       ;
        warn "# >>>> $type ",dump($message);
 
        my $mqueue = $self->{_message_queue} ||= [];
@@ -184,7 +196,7 @@ warn "# <<<< ",$nr2type->{$type}, " ",dump $data;
                $self->{_function}->{$data} = $callback;
                $self->res( $callback );
                warn "# installed $data callback $callback";
-       } elsif ( $type =~ m/^(ECHO_REQ|SUBMIT_JOB|GRAB_JOB)$/ ) { # sync commands
+       } elsif ( $type =~ m/^(ECHO_REQ|SUBMIT_JOB|GRAB_JOB|TEXT)$/ ) { # sync commands
                $self->start;
        }
 
@@ -267,7 +279,9 @@ sub _on_read {
        $data = $self->{message}->{$id} .= $data;
        my ($magic, $type, $len) = unpack( "a4NN", $data );
 
-       if ( length $data < $len ) {
+       if ( substr($data,0,1) ne "\x00" ) {
+               return if $data !~ s/\.[\n\r]$//s;
+       } elsif ( length $data < $len ) {
                warn "# _on_read incomplete message";
                return;
        }

diff --git a/t/client.t b/t/client.t
index c8b824b..5755803 100755 (executable)
--- a/t/client.t
+++ b/t/client.t
@@ -13,9 +13,11 @@ my $g = new_ok 'MojoX::Gearman';
 ok( my $echo = $g->req( 'ECHO_REQ', "foobar" ), 'ECHO' );
 cmp_ok $echo, 'eq', "foobar";
 
-ok( my $ping = $g->req( 'SUBMIT_JOB', 'ping', '', 'bla' ), 'SUBMIT_JOB' );
-like $ping, qr/pong/, 'got pong';
-diag dump $ping;
+ok( my $workers = $g->req( 'TEXT', 'workers' ), 'workers' );
+diag "workers $workers";
+
+ok( my $status = $g->req( 'TEXT', 'status' ), 'status' );
+diag dump $status;
 
 ok( $g->req( 'ECHO_REQ', "alive" ), 'ECHO - still alive - still alive?' );