--- loncom/lonnet/perl/lonnet.pm 2007/06/25 23:31:33 1.890.2.2 +++ loncom/lonnet/perl/lonnet.pm 2007/06/18 22:52:33 1.892 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.890.2.2 2007/06/25 23:31:33 albertel Exp $ +# $Id: lonnet.pm,v 1.892 2007/06/18 22:52:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -214,6 +214,24 @@ sub reply { # ----------------------------------------------------------- Send USR1 to lonc sub reconlonc { + my ($lonid) = @_; + my $hostname = &hostname($lonid); + if ($lonid) { + my $peerfile="$perlvar{'lonSockDir'}/$hostname"; + if ($hostname && -e $peerfile) { + &logthis("Trying to reconnect lonc for $lonid ($hostname)"); + my $client=IO::Socket::UNIX->new(Peer => $peerfile, + Type => SOCK_STREAM, + Timeout => 10); + if ($client) { + print $client ("reset_retries\n"); + my $answer=<$client>; + #reset just this one. + } + } + return; + } + &logthis("Trying to reconnect lonc"); my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; if (open(my $fh,"<$loncfile")) { @@ -7977,7 +7995,6 @@ sub get_dns { sub get_iphost { my ($ignore_cache) = @_; - if (!$ignore_cache) { if (%iphost) { return %iphost; @@ -7991,31 +8008,16 @@ sub get_dns { return %iphost; } } - - # get yesterday's info for fallback - my %old_name_to_ip; - my ($ip_info,$cached)= - &Apache::lonnet::is_cached_new('iphost','iphost'); - if ($cached) { - %old_name_to_ip = %{$ip_info->[1]}; - } - my %name_to_host = &all_names(); foreach my $name (keys(%name_to_host)) { my $ip; if (!exists($name_to_ip{$name})) { $ip = gethostbyname($name); if (!$ip || length($ip) ne 4) { - if (defined($old_name_to_ip{$name})) { - $ip = $old_name_to_ip{$name}; - &logthis("Can't find $name defaulting to old $ip"); - } else { - &logthis("Name $name no IP found"); - next; - } - } else { - $ip=inet_ntoa($ip); + &logthis("Skipping name $name no IP found"); + next; } + $ip=inet_ntoa($ip); $name_to_ip{$name} = $ip; } else { $ip = $name_to_ip{$name}; @@ -8027,7 +8029,7 @@ sub get_dns { } &Apache::lonnet::do_cache_new('iphost','iphost', [\%iphost,\%name_to_ip,\%lonid_to_ip], - 48*60*60); + 24*60*60); return %iphost; }