projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more pc11->pc61 stats improvements
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 8b8eba07e8c80a546e5ae3e05baf3c541e982300..c12c59bdfc496dedcf1e10b247c3360dd526b4e3 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-301,7
+301,7
@@
sub handle_11
$spot[14] = $r->ip;
++$rpc11_to_61;
my $percent = int($rpc11_to_61 * 100 / $pc11_rx);
$spot[14] = $r->ip;
++$rpc11_to_61;
my $percent = int($rpc11_to_61 * 100 / $pc11_rx);
- dbg("recurse: $recurse PC11 spot $key promoted to pc61
($percent\%) ip $spot[14]
pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
+ dbg("recurse: $recurse PC11 spot $key promoted to pc61
ip $spot[14] ($percent\%)
pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
undef $pc11_saved;
}
undef $pc11_saved;
}
@@
-322,7
+322,9
@@
sub handle_11
}
} else {
}
} else {
- dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61 $pc11_to_61") if isdbg("pc11");
+ my $count = $pc11_to_61+$rpc11_to_61+0;
+ my $percent = $pc11_rx ? int($count / $pc11_rx) : 0;
+ dbg("recurse: $recurse PC61 spot $key passed onward pc61: $pc61_rx pc11: $pc11_rx -> pc61: $count ($percent\%)") if isdbg("pc11");
$recurse = 0;
undef $pc11_saved;
}
$recurse = 0;
undef $pc11_saved;
}
@@
-802,7
+804,7
@@
sub handle_18
my $parent = Route::Node::get($self->{call});
# record the type and version offered
my $parent = Route::Node::get($self->{call});
# record the type and version offered
- if (my ($
version) = $pc->[1] =~ /(?:DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+))/
) {
+ if (my ($
software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i
) {
$version += 0;
$version += 53 if $version < 6;
$self->{version} = $version;
$version += 0;
$version += 53 if $version < 6;
$self->{version} = $version;
@@
-813,7
+815,7
@@
sub handle_18
$self->{build} = $build;
$self->user->build($build);
$parent->build($build);
$self->{build} = $build;
$self->user->build($build);
$parent->build($build);
- dbg("$self->{call} =
DXSpider
version $version build $build");
+ dbg("$self->{call} =
$software
version $version build $build");
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->user->sort('S');
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->user->sort('S');
@@
-828,7
+830,7
@@
sub handle_18
$self->user->version($self->version);
}
$self->user->version($self->version);
}
- if ($pc->[1] =~ /
\bpc9x/
) {
+ if ($pc->[1] =~ /
CC\*Cluster/i || $pc->[1] =~ /\bpc9x/i
) {
if ($self->{isolate}) {
dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
} elsif (!$self->user->wantpc9x) {
if ($self->{isolate}) {
dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
} elsif (!$self->user->wantpc9x) {
@@
-1029,7
+1031,7
@@
sub handle_20
my $origin = shift;
my $pc = shift;
my $origin = shift;
my $pc = shift;
- if ($self->{do_pc9x} && $self->{state} ne 'init92') {
+ if ($self->{do_pc9x} && $self->{state} ne 'init92'
&& $self->{state} ne 'normal'
) {
$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
$self->{do_pc9x} = 0;
}
$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
$self->{do_pc9x} = 0;
}
@@
-1123,7
+1125,7
@@
sub handle_22
my $pc = shift;
if ($self->{do_pc9x}) {
my $pc = shift;
if ($self->{do_pc9x}) {
- if ($self->{state} ne 'init92') {
+ if ($self->{state} ne 'init92'
&& $self->{state} ne 'normal'
) {
$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
$self->{do_pc9x} = 0;
}
$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
$self->{do_pc9x} = 0;
}