--- AnyEvent-MP/MP/Node.pm	2012/03/21 23:48:39	1.61
+++ AnyEvent-MP/MP/Node.pm	2012/03/22 00:48:29	1.62
@@ -142,7 +142,7 @@
 
    return unless @$addresses;
    
-   $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@$addresses]");
+   AE::log 9 => "connecting to $self->{id} with [@$addresses]";
 
    my $monitor  = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
    my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
@@ -157,66 +157,11 @@
    $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
       my $endpoint = pop @endpoints;
 
-      $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
+      AE::log 9 => "connecting to $self->{id} at $endpoint";
 
       $self->{trial}{$endpoint} ||= do {
          my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
-            or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
-
-         AnyEvent::MP::Transport::mp_connect
-            $host, $port,
-            sub { delete $self->{trial}{$endpoint} },
-      };
-   };
-}
-
-sub connect {
-   my ($self) = @_;
-
-   return if $self->{transport};
-   return if $self->{connect_w};
-
-   Scalar::Util::weaken $self;
-
-   my $monitor = $AnyEvent::MP::Kernel::CONFIG->{monitor_timeout};
-
-   $self->{connect_to} ||= AE::timer $monitor, 0, sub {
-      $self->transport_error (transport_error => $self->{id}, "unable to connect");
-   };
-
-   # maybe @$addresses?
-   my @addresses = @{ $AnyEvent::MP::Kernel::GLOBAL_DB{"'l"}{$self->{id}} };
-
-   unless (@addresses) {
-      # on global nodes, all bets are off now - we either know the node, or we don't
-      unless ($AnyEvent::MP::Kernel::GLOBAL) {
-         AnyEvent::MP::Kernel::g_find ($self->{id});
-      }
-      return;
-   }
-
-   $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} with [@addresses]");
-
-   my $interval = $AnyEvent::MP::Kernel::CONFIG->{connect_interval};
-
-   $interval = ($monitor - $interval) / @addresses
-      if ($monitor - $interval) / @addresses < $interval;
-
-   $interval = 0.4 if $interval < 0.4;
-
-   my @endpoints;
-
-   $self->{connect_w} = AE::timer 0, $interval * (0.9 + 0.1 * rand), sub {
-      @endpoints = @addresses
-         unless @endpoints;
-
-      my $endpoint = shift @endpoints;
-
-      $AnyEvent::MP::Kernel::WARN->(9, "connecting to $self->{id} at $endpoint");
-
-      $self->{trial}{$endpoint} ||= do {
-         my ($host, $port) = AnyEvent::Socket::parse_hostport $endpoint
-            or return $AnyEvent::MP::Kernel::WARN->(1, "$self->{id}: not a resolved node reference.");
+            or return AE::log critical => "$self->{id}: '$endpoint' is not a resolved node reference.";
 
          AnyEvent::MP::Transport::mp_connect
             $host, $port,
@@ -298,7 +243,7 @@
 sub transport_connect {
    my ($self, $tp) = @_;
 
-   $AnyEvent::MP::Kernel::WARN->(9, "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})");
+   AE::log 9 => "I refuse to talk to myself ($tp->{peerhost}:$tp->{peerport})";
 }
 
 sub kill {