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

Diff for /loncom/lond between versions 1.74 and 1.75

version 1.74, 2002/03/03 19:49:00 version 1.75, 2002/03/27 04:07:02
Line 160  $server = IO::Socket::INET->new(LocalPor Line 160  $server = IO::Socket::INET->new(LocalPor
   
 # global variables  # global variables
   
 $MAX_CLIENTS_PER_CHILD  = 5;        # number of clients each child should   $MAX_CLIENTS_PER_CHILD  = 50;        # number of clients each child should 
                                     # process                                      # process
 %children               = ();       # keys are current child process IDs  %children               = ();       # keys are current child process IDs
 $children               = 0;        # current number of children  $children               = 0;        # current number of children
Line 301  sub reconlonc { Line 301  sub reconlonc {
         if (kill 0 => $loncpid) {          if (kill 0 => $loncpid) {
     &logthis("lonc at pid $loncpid responding, sending USR1");      &logthis("lonc at pid $loncpid responding, sending USR1");
             kill USR1 => $loncpid;              kill USR1 => $loncpid;
             sleep 1;              sleep 5;
             if (-e "$peerfile") { return; }              if (-e "$peerfile") { return; }
             &logthis("$peerfile still not there, give it another try");              &logthis("$peerfile still not there, give it another try");
             sleep 5;              sleep 10;
             if (-e "$peerfile") { return; }              if (-e "$peerfile") { return; }
             &logthis(              &logthis(
  "<font color=blue>WARNING: $peerfile still not there, giving up</font>");   "<font color=blue>WARNING: $peerfile still not there, giving up</font>");
Line 342  sub reply { Line 342  sub reply {
     if ($answer eq 'con_lost') {      if ($answer eq 'con_lost') {
  $answer=subreply("ping",$server);   $answer=subreply("ping",$server);
         if ($answer ne $server) {          if ($answer ne $server) {
       &logthis("sub reply: answer != server");
            &reconlonc("$perlvar{'lonSockDir'}/$server");             &reconlonc("$perlvar{'lonSockDir'}/$server");
         }          }
         $answer=subreply($cmd,$server);          $answer=subreply($cmd,$server);
Line 531  sub make_new_child { Line 532  sub make_new_child {
             }              }
             if ($clientok) {              if ($clientok) {
 # ---------------- New known client connecting, could mean machine online again  # ---------------- New known client connecting, could mean machine online again
       &reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");  
         # &reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");
               &logthis(                &logthis(
        "<font color=green>Established connection: $hostid{$clientip}</font>");         "<font color=green>Established connection: $hostid{$clientip}</font>");
               &status('Will listen to '.$hostid{$clientip});                &status('Will listen to '.$hostid{$clientip});
Line 554  sub make_new_child { Line 556  sub make_new_child {
     }      }
     $userinput=substr($userinput,0,$cmdlength);      $userinput=substr($userinput,0,$cmdlength);
                     $wasenc=1;                      $wasenc=1;
   }  
  }   }
         }
     
 # ------------------------------------------------------------- Normal commands  # ------------------------------------------------------------- Normal commands
 # ------------------------------------------------------------------------ ping  # ------------------------------------------------------------------------ ping
    if ($userinput =~ /^ping/) {     if ($userinput =~ /^ping/) {
Line 1421  sub make_new_child { Line 1424  sub make_new_child {
                 $client->close();                  $client->close();
                 &logthis("<font color=blue>WARNING: "                  &logthis("<font color=blue>WARNING: "
                 ."Rejected client $clientip, closing connection</font>");                  ."Rejected client $clientip, closing connection</font>");
             }                            }
             &logthis("<font color=red>CRITICAL: "   }              
                     ."Disconnect from $clientip ($hostid{$clientip})</font>");  
 # =============================================================================  # =============================================================================
         }         
        &logthis("<font color=red>CRITICAL: "
    ."Disconnect from $clientip ($hostid{$clientip})</font>");    
         # tidy up gracefully and finish          # tidy up gracefully and finish
           
         $server->close();          $server->close();
Removed from v.1.74  
changed lines
  Added in v.1.75

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