X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FInvestigate.pm;h=d827d61cc4d8d37628b14a13287f981ce49106b4;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=5fce74b652d4102bf201953e46529f55a186d82b;hpb=b70be747913c158cb53bc6f7277f803f93bbb98d;p=spider.git diff --git a/perl/Investigate.pm b/perl/Investigate.pm index 5fce74b6..d827d61c 100644 --- a/perl/Investigate.pm +++ b/perl/Investigate.pm @@ -21,12 +21,6 @@ use DXDebug; use DXUtil; -use vars qw($VERSION $BRANCH); -$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); -$main::build += $VERSION; -$main::branch += $BRANCH; - use vars qw (%list %valid $pingint $maxpingwait); $pingint = 5; # interval between pings for each investigation @@ -95,7 +89,7 @@ sub handle_ping $user->set_believe($self->{call}); $user->put; } - my $dxchan = DXChannel->get($self->{via}); + my $dxchan = DXChannel::get($self->{via}); if ($dxchan) { dbg("Investigate: sending PC19 for $self->{call}") if isdbg('investigate'); foreach my $pc (@{$self->{pcxx}}) { @@ -122,9 +116,9 @@ sub process { while (my ($k, $v) = each %list) { if ($v->{state} eq 'start') { - my $v = $via{$v->{via}} || 0; - if ($main::systime > $v+$pingint) { - DXProt::addping($main::mycall, $v->{call}, $v->{via}); + my $via = $via{$v->{via}} || 0; + if ($main::systime > $via+$pingint) { + DXXml::Ping::add($main::me, $v->{call}, $v->{via}); $v->{start} = $lastping = $main::systime; dbg("Investigate: ping sent to $v->{call} via $v->{via}") if isdbg('investigate'); $v->chgstate('waitping');