X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=81c2e40a0090aa09ecdeba30e94dd01ae6cd70a6;hb=1ee64082ae257818e71f8ec1a471dbac31bd746a;hp=09b0e634e6fc28c6f81ff4faac933e734ceb5109;hpb=c7a3cfda9336d765d387e9328f817d1f0e5230d1;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 09b0e634..81c2e40a 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);
 	}
@@ -264,7 +257,7 @@ sub disconnect
 	my ($pkg, $fn, $line) = caller if $dbg;
 
 	if ($count >= 2) {
-		dbg((ref $conn) . "::disconnect on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line FORCING CLOSE ") if $dbg;
+		dbgtrace((ref $conn) . "::disconnect on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line FORCING CLOSE ") if $dbg;
 		_close_it($conn);
 		return;
 	}
@@ -489,10 +482,10 @@ sub new_client {
 	$sock->on(read => sub {$conn->_rcv($_[1])});
 	$sock->timeout(0);
 	$sock->start;
-	$conn->{peerhost} = $handle->peerhost;
+	$conn->{peerhost} = $handle->peerhost || 'unknown';
 	$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');
+	$conn->{peerport} = $handle->peerport || 0;
+	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) {
@@ -560,8 +553,7 @@ sub DESTROY
 
 	if (isdbg('connll')) {
 		my ($pkg, $fn, $line) = caller;
-		dbg((ref $conn) . "::DESTROY on call $call called from ${pkg}::${fn} line $line ");
-		
+		dbgtrace((ref $conn) . "::DESTROY on call $call called from ${pkg}::${fn} line $line ");
 	}
 
 	my $call = $conn->{call} || 'unallocated';