[BACK]Return to lond CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.373 and 1.376

version 1.373, 2007/04/10 23:11:30 version 1.376, 2007/07/25 22:52:07
Line 4640  sub inst_usertypes_handler { Line 4640  sub inst_usertypes_handler {
 }  }
 &register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);  &register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);
   
   sub inst_dirsrch_handler {
       my ($cmd, $tail, $client) = @_;
       my ($domain,$srchby,$srchterm,$srchtype) = split(/:/, $tail);
       $srchby = &unescape($srchby);
       $srchterm = &unescape($srchterm);
       my $userinput = $cmd.":".$tail; # For logging purposes.
       my (%instusers,%instids,$result,$res);
       eval {
           local($SIG{__DIE__})='DEFAULT';
           $result=&localenroll::get_userinfo($domain,undef,undef,\%instusers,\%instids,undef,$srchby,$srchterm,$srchtype);
       };
       if ($result eq 'ok') {
           if (keys(%instusers) > 0) {
               foreach my $key (keys(%instusers)) {
                   my $usrstr = &Apache::lonnet::hash2str(%{$instusers{$key}});
                   $res.=&escape($key).'='.&escape($usrstr).'&';
               }
           }
           $res=~s/\&$//;
       }
       &Reply($client, "$res\n", $userinput);
   }
   &register_handler("instdirsrch", \&inst_dirsrch_handler, 0, 1, 0);
   
 # mkpath makes all directories for a file, expects an absolute path with a  # mkpath makes all directories for a file, expects an absolute path with a
 # file or a trailing / if just a dir is passed  # file or a trailing / if just a dir is passed
 # returns 1 on success 0 on failure  # returns 1 on success 0 on failure
Line 5048  sub UpdateHosts { Line 5072  sub UpdateHosts {
   
     foreach my $child (keys(%children)) {      foreach my $child (keys(%children)) {
  my $childip = $children{$child};   my $childip = $children{$child};
  if (!defined(&Apache::lonnet::get_hosts_from_ip($childip))) {   if ($childip ne '127.0.0.1'
       && !defined(&Apache::lonnet::get_hosts_from_ip($childip))) {
     logthis('<font color="blue"> UpdateHosts killing child '      logthis('<font color="blue"> UpdateHosts killing child '
     ." $child for ip $childip </font>");      ." $child for ip $childip </font>");
     kill('INT', $child);      kill('INT', $child);
Line 5485  sub make_new_child { Line 5510  sub make_new_child {
 # ---------------- New known client connecting, could mean machine online again  # ---------------- New known client connecting, could mean machine online again
     if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip       if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip 
  && $clientip ne '127.0.0.1') {   && $clientip ne '127.0.0.1') {
  &Apache::lonnet::reconlonc();   &Apache::lonnet::reconlonc($clientname);
     }      }
     &logthis("<font color='green'>Established connection: $clientname</font>");      &logthis("<font color='green'>Established connection: $clientname</font>");
     &status('Will listen to '.$clientname);      &status('Will listen to '.$clientname);
Removed from v.1.373  
changed lines
  Added in v.1.376

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>