X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=5e40d3c2afa5bdfb86e9a8b3aaf302a551f3ebd6;hb=c30a89a0f34e861b9eb136c07ff4ea5ed9a460a0;hp=09b0e634e6fc28c6f81ff4faac933e734ceb5109;hpb=c7a3cfda9336d765d387e9328f817d1f0e5230d1;p=spider.git diff --git a/perl/Msg.pm b/perl/Msg.pm index 09b0e634..5e40d3c2 100644 --- a/perl/Msg.pm +++ b/perl/Msg.pm @@ -29,7 +29,6 @@ $now = time; $cnum = 0; $connect_timeout = 5; $disc_waittime = 1.5; -%conns; our %delqueue; @@ -103,12 +102,6 @@ sub conns return $ref; } -# this is called as a FUNCTION i.e my $conn = Msg::get($call); -sub get -{ - return $conns{shift}; -} - # this is only called by any dependent processes going away unexpectedly sub pid_gone { @@ -153,7 +146,7 @@ sub _on_connect $sock->timeout(0); $sock->start; $conn->{peerhost} = eval { $handle->peerhost; }; - dbg((ref $conn) . " connected $conn->{cnum} to $conn->{peerhost}:$conn->{peerport}") if isdbg('connll'); + dbg((ref $conn) . " connected $conn->{cnum} to $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg ('connect'); if ($conn->{on_connect}) { &{$conn->{on_connect}}($conn, $handle); } @@ -492,7 +485,7 @@ sub new_client { $conn->{peerhost} = $handle->peerhost; $conn->{peerhost} =~ s|^::ffff:||; # chop off leading pseudo IPV6 stuff on dual stack listeners $conn->{peerport} = $handle->peerport; - dbg((ref $conn) . " accept $conn->{cnum} from $conn->{peerhost}:$conn->{peerport}") if isdbg('connll'); + dbg((ref $conn) . " accept $conn->{cnum} from $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg('connect'); my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost}, $conn->{peerport}); $conn->{sort} = 'Incoming'; if ($eproc) {