X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FReadChannel.pm;h=d2008db056b99613efbd8db9dcbe44dae5a1954b;hp=f6a7cca65c1dada32a5e1a405d979918151b7035;hb=783105c4013747147c7195f043961af40b9908b7;hpb=b7a853b30e7397854a813f6a5878e50703a20079 diff --git a/lib/Object/Remote/ReadChannel.pm b/lib/Object/Remote/ReadChannel.pm index f6a7cca..d2008db 100644 --- a/lib/Object/Remote/ReadChannel.pm +++ b/lib/Object/Remote/ReadChannel.pm @@ -1,11 +1,11 @@ package Object::Remote::ReadChannel; -use CPS::Future; use Scalar::Util qw(weaken openhandle); -use Object::Remote::Logging qw(:log :dlog); -use POSIX; +use Object::Remote::Logging qw(:log :dlog router ); use Moo; +BEGIN { router()->exclude_forwarding } + has fh => ( is => 'ro', required => 1, trigger => sub { @@ -39,10 +39,7 @@ sub _receive_data_from { while (my $cb = $self->on_line_call and $$rb =~ s/^(.*)\n//) { $cb->(my $line = $1); } - #TODO this isn't compatible with Windows but would be if - #EAGAIN was set to something that could never match - #if on Windows - } elsif ($! != EAGAIN) { + } else { log_trace { "Got EOF or error, this read channel is done" }; Object::Remote->current_loop ->unwatch_io( @@ -58,14 +55,12 @@ sub DEMOLISH { my ($self, $gd) = @_; return if $gd; log_trace { "read channel is being demolished" }; - + Object::Remote->current_loop ->unwatch_io( handle => $self->fh, on_read_ready => 1 ); - - } 1;