X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=3e30372ff1111bbac4923b6837c5a01618d8d620;hb=1a81fd5d534cfad7f4e5aa49b30009fe46218716;hp=3c4b51f3d0d2504adff8ccaf7bd61781bf6163f9;hpb=f45d04e999b798f21ddcb887cf1bb9f3eb3a27b4;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 3c4b51f3..3e30372f 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -146,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);
 	}
@@ -257,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;
 	}
@@ -345,9 +345,7 @@ sub _send_stuff
 		my $lth = length $data;
 		my $call = $conn->{call} || 'none';
 		if (isdbg('raw')) {
-			if (isdbg('raw')) {
-				dbgdump('raw', "$call send $lth: ", $lth);
-			}
+			dbgdump('raw', "$call send $lth:", $data);
 		}
 		if (defined $sock) {
 			$sock->write($data);
@@ -482,10 +480,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) {
@@ -553,8 +551,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';