From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 12 May 2017 20:28:07 +0000 (+0100)
Subject: add some extra debugging to AsyncMsg
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dfb716ea6436908b5c7e3905f4cf14314c09b9cc;p=spider.git

add some extra debugging to AsyncMsg
---

diff --git a/perl/AsyncMsg.pm b/perl/AsyncMsg.pm
index e6ae80c6..9d2f0284 100644
--- a/perl/AsyncMsg.pm
+++ b/perl/AsyncMsg.pm
@@ -37,7 +37,7 @@ sub handle_get
 
 	my $state = $conn->{_asstate};
 	
-	dbg("asyncmsg: $state $msg") if isdbg('async');
+	dbg("AsyncMsg: $state $msg") if isdbg('async');
 
 	# no point in going on if there is no-one wanting the output anymore
 	my $dxchan = DXChannel::get($conn->{caller});
@@ -76,7 +76,7 @@ sub handle_get
 			if ($newconn) {
 				# copy over any elements in $conn that are not in $newconn
 				while (my ($k,$v) = each %$conn) {
-					dbg("async: $state copying over $k -> \$newconn") if isdbg('async');
+					dbg("AsyncMsg: $state copying over $k -> \$newconn") if isdbg('async');
 					$newconn{$k} = $v unless exists $newconn{$k};
 				}
 			}
@@ -123,7 +123,7 @@ sub handle_raw
 	$dxchan->send("$prefix$msg");
 }
 
-sub new 
+sub new
 {
 	my $pkg = shift;
 	my $call = shift;
@@ -181,20 +181,19 @@ sub _getpost
 	
 	$r = $conn->connect($host, $port);
 	if ($r) {
-		dbg("Sending '$sort $path HTTP/1.1'") if isdbg('async');
-		$conn->send_later("$sort $path HTTP/1.1\r\n");
+		_send_later($conn, "$sort $path HTTP/1.1\r\n");
 
 		my $h = delete $args{Host} || $host;
 		my $u = delete $args{'User-Agent'} || "DxSpider;$main::version;$main::build;$^O;$main::mycall"; 
 		my $d = delete $args{data};
 		
-	    $conn->send_later("Host: $h\r\n");
-		$conn->send_later("User-Agent: $u\r\n");
+	    _send_later($conn, "Host: $h\r\n");
+		_send_later($conn, "User-Agent: $u\r\n");
 		while (my ($k,$v) = each %args) {
-			$conn->send_later("$k: $v\r\n");
+			_send_later($conn, "$k: $v\r\n");
 		}
-		$conn->send_later("\r\n$d") if defined $d;
-		$conn->send_later("\r\n");
+		_send_later($conn, "\r\n$d") if defined $d;
+		_send_later($conn, "\r\n");
 	}
 	
 	return $r ? $conn : undef;
@@ -270,6 +269,19 @@ sub disconnect
 	$conn->SUPER::disconnect;
 }
 
+sub _send_later
+{
+	my $conn = shift;
+	my $m = shift;
+	
+	if (isdbg('async')) {
+		my $s = $m;
+		$s =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+		dbg("AsyncMsg: send $s");
+	}
+	$conn->send_later($m);
+}
+
 sub DESTROY
 {
 	my $conn = shift;