projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove Prot.pm, sort %valid fields
[spider.git]
/
perl
/
Msg.pm
diff --git
a/perl/Msg.pm
b/perl/Msg.pm
index d0ad733048a3c0699d14695ae2263fb48ac80074..9a6f8d1f06894cd25d749afc9d2bac8019fd132d 100644
(file)
--- a/
perl/Msg.pm
+++ b/
perl/Msg.pm
@@
-18,7
+18,7
@@
use Mojo::IOLoop;
use Mojo::IOLoop::Stream;
use DXDebug;
use Mojo::IOLoop::Stream;
use DXDebug;
-use Timer;
+use
DX
Timer;
use vars qw($now %conns $noconns $cnum $total_in $total_out $total_lines_in $total_lines_out $connect_timeout $disc_waittime);
use vars qw($now %conns $noconns $cnum $total_in $total_out $total_lines_in $total_lines_out $connect_timeout $disc_waittime);
@@
-133,6
+133,7
@@
sub peerhost
$conn->{peerhost} ||= $conn->{sock}->handle->peerhost if $conn->{sock};
$conn->{peerhost} ||= 'UNKNOWN';
}
$conn->{peerhost} ||= $conn->{sock}->handle->peerhost if $conn->{sock};
$conn->{peerhost} ||= 'UNKNOWN';
}
+ $conn->{peerhost} =~ s/^::ffff://;
return $conn->{peerhost};
}
return $conn->{peerhost};
}
@@
-291,7
+292,8
@@
sub disconnect
dbg("Buffer empty, just close $call") if $dbg;
_close_it($conn);
}
dbg("Buffer empty, just close $call") if $dbg;
_close_it($conn);
}
- } else {
+ }
+ else {
dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
_close_it($conn);
}
dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
_close_it($conn);
}
@@
-320,7
+322,7
@@
sub _close_it
if ($sock) {
dbg((ref $conn) . " Connection $conn->{cnum} $call closing gracefully") if isdbg('connll');
if ($sock) {
dbg((ref $conn) . " Connection $conn->{cnum} $call closing gracefully") if isdbg('connll');
- $sock->close_gracefully;
+ $sock->close_gracefully
if $sock->can('close_gracefully')
;
}
# get rid of any references
}
# get rid of any references
@@
-570,7
+572,8
@@
sub DESTROY
my $sock = $conn->{sock};
if ($sock) {
my $sock = $conn->{sock};
if ($sock) {
- $sock->close_gracefully;
+ $sock->close_gracefully if $sock->can('close_gracefully');
+ delete $conn->{sock};
}
$noconns--;
}
$noconns--;