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

Diff for /loncom/lond between versions 1.57 and 1.59

version 1.57, 2001/11/26 20:31:01 version 1.59, 2001/11/27 21:59:07
Line 17 Line 17
 # 04/02 Scott Harrison  # 04/02 Scott Harrison
 # 05/11,05/28,08/30 Gerd Kortemeyer  # 05/11,05/28,08/30 Gerd Kortemeyer
 # 9/30,10/22,11/13,11/15,11/16 Scott Harrison  # 9/30,10/22,11/13,11/15,11/16 Scott Harrison
 # 11/26 Gerd Kortemeyer  # 11/26,11/27 Gerd Kortemeyer
 #  #
 # $Id$  # $Id$
 ###  ###
Line 53  sub catchexception { Line 53  sub catchexception {
      ."a crash with this error msg->[$error]</font>");       ."a crash with this error msg->[$error]</font>");
     &logthis('Famous last words: '.$status.' - '.$lastlog);      &logthis('Famous last words: '.$status.' - '.$lastlog);
     if ($client) { print $client "error: $error\n"; }      if ($client) { print $client "error: $error\n"; }
       $server->close();
     die($error);      die($error);
 }  }
   
Line 138  sub REAPER {                        # ta Line 139  sub REAPER {                        # ta
 sub HUNTSMAN {                      # signal handler for SIGINT  sub HUNTSMAN {                      # signal handler for SIGINT
     local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children      local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children
     kill 'INT' => keys %children;      kill 'INT' => keys %children;
       &logthis("Free socket: ".shutdown($server,2)); # free up socket
     my $execdir=$perlvar{'lonDaemons'};      my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lond.pid");      unlink("$execdir/logs/lond.pid");
     &logthis("<font color=red>CRITICAL: Shutting down</font>");      &logthis("<font color=red>CRITICAL: Shutting down</font>");
Line 147  sub HUNTSMAN {                      # si Line 149  sub HUNTSMAN {                      # si
 sub HUPSMAN {                      # signal handler for SIGHUP  sub HUPSMAN {                      # signal handler for SIGHUP
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children      local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;      kill 'INT' => keys %children;
     close($server);                # free up socket      &logthis("Free socket: ".shutdown($server,2)); # free up socket
     &logthis("<font color=red>CRITICAL: Restarting</font>");      &logthis("<font color=red>CRITICAL: Restarting</font>");
     unlink("$execdir/logs/lond.pid");      unlink("$execdir/logs/lond.pid");
     my $execdir=$perlvar{'lonDaemons'};      my $execdir=$perlvar{'lonDaemons'};
Line 175  sub logthis { Line 177  sub logthis {
     my $fh=IO::File->new(">>$execdir/logs/lond.log");      my $fh=IO::File->new(">>$execdir/logs/lond.log");
     my $now=time;      my $now=time;
     my $local=localtime($now);      my $local=localtime($now);
       $lastlog=$local.': '.$message;
     print $fh "$local ($$): $message\n";      print $fh "$local ($$): $message\n";
 }  }
   
Line 445  sub make_new_child { Line 448  sub make_new_child {
                   } else {                    } else {
       &logthis(        &logthis(
  "<font color=blue>WARNING: $clientip did not reply challenge</font>");   "<font color=blue>WARNING: $clientip did not reply challenge</font>");
                       print $client "bye\n";  
                       &status('No challenge reply '.$clientip);                        &status('No challenge reply '.$clientip);
                   }                    }
               } else {                } else {
   &logthis(    &logthis(
                     "<font color=blue>WARNING: "                      "<font color=blue>WARNING: "
                    ."$clientip failed to initialize: >$remotereq< </font>");                     ."$clientip failed to initialize: >$remotereq< </font>");
   print $client "bye\n";  
                   &status('No init '.$clientip);                    &status('No init '.$clientip);
               }                }
     } else {      } else {
               &logthis(                &logthis(
  "<font color=blue>WARNING: Unknown client $clientip</font>");   "<font color=blue>WARNING: Unknown client $clientip</font>");
               print $client "bye\n";  
               &status('Hung up on '.$clientip);                &status('Hung up on '.$clientip);
             }              }
             if ($clientok) {              if ($clientok) {
Line 466  sub make_new_child { Line 466  sub make_new_child {
       &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('Listening to '.$hostid{$clientip});                &status('Will listen to '.$hostid{$clientip});
 # ------------------------------------------------------------ Process requests  # ------------------------------------------------------------ Process requests
               while (my $userinput=<$client>) {                while (my $userinput=<$client>) {
                 chomp($userinput);                  chomp($userinput);
Line 1293  sub make_new_child { Line 1293  sub make_new_child {
                        &logthis(                         &logthis(
       "Client $clientip ($hostid{$clientip}) hanging up: $userinput");        "Client $clientip ($hostid{$clientip}) hanging up: $userinput");
                        print $client "bye\n";                         print $client "bye\n";
                          $client->close();
        last;         last;
 # ------------------------------------------------------------- unknown command  # ------------------------------------------------------------- unknown command
                    } else {                     } else {
                        # unknown command                         # unknown command
                        print $client "unknown_cmd\n";                         print $client "unknown_cmd\n";
                    }                     }
 # ------------------------------------------------------ client unknown, refuse  # -------------------------------------------------------------------- complete
                      &status('Listening to '.$hostid{$clientip});
        }         }
   # --------------------------------------------- client unknown or fishy, refuse
             } else {              } else {
         print $client "refused\n";          print $client "refused\n";
                   $client->close();
                 &logthis("<font color=blue>WARNING: "                  &logthis("<font color=blue>WARNING: "
                 ."Rejected client $clientip, closing connection</font>");                  ."Rejected client $clientip, closing connection</font>");
             }                            }              
Line 1313  sub make_new_child { Line 1317  sub make_new_child {
           
         # tidy up gracefully and finish          # tidy up gracefully and finish
           
           $client->close();
           $server->close();
   
         # this exit is VERY important, otherwise the child will become          # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into          # a producer of more and more children, forking yourself into
         # process death.          # process death.
Removed from v.1.57  
changed lines
  Added in v.1.59

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