X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=5c990177330ddc26c55fd20ccd7a0fcf242e49b1;hb=26d388e9e65e585c9883ba19fc9b12bdf5aec525;hp=b9e4a63e6a2dd4bd7bd81cb048e915c560803a51;hpb=512ad102c88b3bd56a3435c72ad5288822af20fa;p=spider.git diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm index b9e4a63e..5c990177 100644 --- a/perl/DXMsg.pm +++ b/perl/DXMsg.pm @@ -136,7 +136,7 @@ sub process # this is periodic processing if (!$self || !$line) { - if ($main::systime > $lastq + $queueinterval) { + if ($main::systime >= $lastq + $queueinterval) { # wander down the work queue stopping any messages that have timed out for (keys %busy) { @@ -507,6 +507,7 @@ sub read_msg_header $file = new IO::File "$fn"; if (!$file) { dbg('err', "Error reading $fn $!"); + Log('err', "Error reading $fn $!"); return undef; } $size = -s $fn; @@ -515,6 +516,7 @@ sub read_msg_header $size -= length $line; if (! $line =~ /^===/o) { dbg('err', "corrupt first line in $fn ($line)"); + Log('err', "corrupt first line in $fn ($line)"); return undef; } $line =~ s/^=== //o; @@ -526,6 +528,7 @@ sub read_msg_header $size -= length $line; if (! $line =~ /^===/o) { dbg('err', "corrupt second line in $fn ($line)"); + Log('err', "corrupt second line in $fn ($line)"); return undef; } $line =~ s/^=== //o; @@ -552,6 +555,7 @@ sub read_msg_body $file = new IO::File; if (!open($file, $fn)) { dbg('err' ,"Error reading $fn $!"); + Log('err' ,"Error reading $fn $!"); return undef; } @out = map {chomp; $_} <$file>; @@ -612,7 +616,7 @@ sub queue_msg next if $ref->{'read'}; # if it is read, it is stuck here $clref = DXCluster->get_exact($ref->{to}); unless ($clref) { # otherwise look for a homenode - my $uref = DXUser->get($ref->{to}); + my $uref = DXUser->get_current($ref->{to}); my $hnode = $uref->homenode if $uref; $clref = DXCluster->get_exact($hnode) if $hnode; } @@ -1231,6 +1235,9 @@ sub AUTOLOAD $name =~ s/.*:://o; confess "Non-existant field '$AUTOLOAD'" if !$valid{$name}; + # this clever line of code creates a subroutine which takes over from autoload + # from OO Perl - Conway + *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ; @_ ? $self->{$name} = shift : $self->{$name} ; }