X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnectionServer.pm;h=da4a4d38702462693fcc713f95463e486ec206c4;hp=26536ecc256d41754a34b0d1c3f85b6fec4a5c2a;hb=55c0d0209fa9d9265ff178f54ae9fe5fdddef3c1;hpb=5c608989561bc4892923c9e00dd20db910658fd1

diff --git a/lib/Object/Remote/ConnectionServer.pm b/lib/Object/Remote/ConnectionServer.pm
index 26536ec..da4a4d3 100644
--- a/lib/Object/Remote/ConnectionServer.pm
+++ b/lib/Object/Remote/ConnectionServer.pm
@@ -3,8 +3,8 @@ package Object::Remote::ConnectionServer;
 use Scalar::Util qw(blessed weaken);
 use Module::Runtime qw(use_module);
 use Object::Remote;
+use Object::Remote::Logging qw( :log :dlog );
 use IO::Socket::UNIX;
-use POSIX ();
 use Moo;
 
 has listen_on => (
@@ -19,6 +19,7 @@ has listen_on => (
   },
   trigger => sub {
     my ($self, $fh) = @_;
+    log_debug { "adding connection server to run loop because the trigger has executed" };
     weaken($self);
     Object::Remote->current_loop
                   ->watch_io(
@@ -32,42 +33,58 @@ has connection_args => (
  is => 'ro', default => sub { [] }
 );
 
+has connection_callback => (
+  is => 'ro', default => sub { sub { shift } }
+);
+
 sub BUILD {
+  log_debug { "A connection server has been built; calling want_run on run loop" };
   Object::Remote->current_loop->want_run;
 }
 
 sub run {
+  log_debug { "Connection server is calling run_while_wanted on the run loop" };
   Object::Remote->current_loop->run_while_wanted;
 }
 
 sub _listen_ready {
   my ($self, $fh) = @_;
+  log_debug { "Got a connection, calling accept on the file handle" };
   my $new = $fh->accept or die "Couldn't accept: $!";
+  log_trace { "Setting file handle non-blocking" };
   $new->blocking(0);
   my $f = CPS::Future->new;
+  log_trace { "Creating a new connection with the remote node" };
   my $c = use_module('Object::Remote::Connection')->new(
     receive_from_fh => $new,
     send_to_fh => $new,
     on_close => $f, # and so will die $c
     @{$self->connection_args}
-  );
+  )->${\$self->connection_callback};
   $f->on_ready(sub { undef($c) });
+  log_trace { "marking the future as done" };
   $c->ready_future->done;
+  Dlog_trace { "Sending 'Shere' to socket $_" } $new;
   print $new "Shere\n" or die "Couldn't send to new socket: $!";
+  log_debug { "Connection has been fully handled" };
   return $c;
 }
 
 sub DEMOLISH {
   my ($self, $gd) = @_;
+  log_debug { "A connection server is being destroyed; global destruction: '$gd'" };
   return if $gd;
+  log_trace { "Removing the connection server IO watcher from run loop" };
   Object::Remote->current_loop
                 ->unwatch_io(
                     handle => $self->listen_on,
                     on_read_ready => 1
                   );
   if ($self->listen_on->can('hostpath')) {
+    log_debug { my $p = $self->listen_on->hostpath; "Removing '$p' from the filesystem" };
     unlink($self->listen_on->hostpath);
   }
+  log_trace { "calling want_stop on the run loop" };
   Object::Remote->current_loop->want_stop;
 }