projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f0c390
)
add some extra debugging to AsyncMsg
author
Dirk Koopman
<djk@tobit.co.uk>
Fri, 12 May 2017 20:28:07 +0000
(21:28 +0100)
committer
Dirk Koopman
<djk@tobit.co.uk>
Fri, 12 May 2017 20:28:07 +0000
(21:28 +0100)
perl/AsyncMsg.pm
patch
|
blob
|
history
diff --git
a/perl/AsyncMsg.pm
b/perl/AsyncMsg.pm
index e6ae80c696f39c21904cdbda2fda90a8d730edd4..9d2f0284b3004d87b5a654226e462859624b0cca 100644
(file)
--- a/
perl/AsyncMsg.pm
+++ b/
perl/AsyncMsg.pm
@@
-37,7
+37,7
@@
sub handle_get
my $state = $conn->{_asstate};
my $state = $conn->{_asstate};
- dbg("
asyncm
sg: $state $msg") if isdbg('async');
+ dbg("
AsyncM
sg: $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});
# 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) {
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};
}
}
$newconn{$k} = $v unless exists $newconn{$k};
}
}
@@
-123,7
+123,7
@@
sub handle_raw
$dxchan->send("$prefix$msg");
}
$dxchan->send("$prefix$msg");
}
-sub new
+sub new
{
my $pkg = shift;
my $call = shift;
{
my $pkg = shift;
my $call = shift;
@@
-181,20
+181,19
@@
sub _getpost
$r = $conn->connect($host, $port);
if ($r) {
$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};
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) {
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;
}
return $r ? $conn : undef;
@@
-270,6
+269,19
@@
sub disconnect
$conn->SUPER::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;
sub DESTROY
{
my $conn = shift;