Diff for /loncom/Attic/lonc between versions 1.6 and 1.15

version 1.6, 2000/02/10 23:20:13 version 1.15, 2001/03/15 20:25:20
Line 12 Line 12
   
 # 6/4/99,6/5,6/7,6/8,6/9,6/10,6/11,6/12,7/14,7/19,  # 6/4/99,6/5,6/7,6/8,6/9,6/10,6/11,6/12,7/14,7/19,
 # 10/8,10/9,10/15,11/18,12/22,  # 10/8,10/9,10/15,11/18,12/22,
 # 2/8 Gerd Kortemeyer   # 2/8,7/25 Gerd Kortemeyer
   # 12/05 Scott Harrison
   # 12/05 Gerd Kortemeyer
   # 01/10/01 Scott Harrison
   # 03/14/01,03/15 Gerd Kortemeyer
   # 
 # based on nonforker from Perl Cookbook  # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking  # - server who multiplexes without forking
   
Line 25  use Fcntl; Line 30  use Fcntl;
 use Tie::RefHash;  use Tie::RefHash;
 use Crypt::IDEA;  use Crypt::IDEA;
   
   # grabs exception and records it to log before exiting
   sub catchexception {
       my ($signal)=@_;
       $SIG{'QUIT'}='DEFAULT';
       $SIG{__DIE__}='DEFAULT';
       &logthis("<font color=red>CRITICAL: "
        ."ABNORMAL EXIT. Child $$ for server $wasserver died through "
        ."\"$signal\" with this parameter->[$@]</font>");
       die($@);
   }
   
 $childmaxattempts=10;  $childmaxattempts=10;
   
   # -------------------------------- Set signal handlers to record abnormal exits
   
   $SIG{'QUIT'}=\&catchexception;
   $SIG{__DIE__}=\&catchexception;
   
 # ------------------------------------ Read httpd access.conf and get variables  # ------------------------------------ Read httpd access.conf and get variables
   
 open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";  open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
Line 40  while ($configline=<CONFIG>) { Line 61  while ($configline=<CONFIG>) {
 }  }
 close(CONFIG);  close(CONFIG);
   
   # ----------------------------- Make sure this process is running from user=www
   my $wwwid=getpwnam('www');
   if ($wwwid!=$<) {
      $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
      $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
      system("echo 'User ID mismatch.  lonc must be run as user www.' |\
    mailto $emailto -s '$subj' > /dev/null");
      exit 1;
   }
   
   # --------------------------------------------- Check if other instance running
   
   my $pidfile="$perlvar{'lonDaemons'}/logs/lonc.pid";
   
   if (-e $pidfile) {
      my $lfh=IO::File->new("$pidfile");
      my $pide=<$lfh>;
      chomp($pide);
      if (kill 0 => $pide) { die "already running"; }
   }
   
 # ------------------------------------------------------------- Read hosts file  # ------------------------------------------------------------- Read hosts file
   
 open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";  open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
Line 85  sub HUPSMAN {                      # sig Line 127  sub HUPSMAN {                      # sig
     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("<font color=red>CRITICAL: Restarting</font>");      &logthis("<font color=red>CRITICAL: Restarting</font>");
       unlink("$execdir/logs/lonc.pid");
     my $execdir=$perlvar{'lonDaemons'};      my $execdir=$perlvar{'lonDaemons'};
     exec("$execdir/lonc");         # here we go again      exec("$execdir/lonc");         # here we go again
 }  }
Line 261  $key=$key.$buildkey.$key.$buildkey.$key. Line 304  $key=$key.$buildkey.$key.$buildkey.$key.
 $key=substr($key,0,32);  $key=substr($key,0,32);
 my $cipherkey=pack("H32",$key);  my $cipherkey=pack("H32",$key);
 if ($cipher=new IDEA $cipherkey) {  if ($cipher=new IDEA $cipherkey) {
    &logthis("Secure connection inititalized: $conserver");     &logthis("Secure connection initialized: $conserver");
 } else {  } else {
    my $st=120+int(rand(240));     my $st=120+int(rand(240));
    &logthis(     &logthis(
Line 400  while (1) { Line 443  while (1) {
         $rv = $client->send($outbuffer{$client}, 0);          $rv = $client->send($outbuffer{$client}, 0);
         unless (defined $rv) {          unless (defined $rv) {
             # Whine, but move on.              # Whine, but move on.
             warn "I was told I could write, but I can't.\n";              &logthis("I was told I could write, but I can't.\n");
             next;              next;
         }          }
           $errno=$!;
         if (($rv == length $outbuffer{$client}) ||          if (($rv == length $outbuffer{$client}) ||
             ($! == POSIX::EWOULDBLOCK)) {              ($errno == POSIX::EWOULDBLOCK) || ($errno == 0)) {
             substr($outbuffer{$client}, 0, $rv) = '';              substr($outbuffer{$client}, 0, $rv) = '';
             delete $outbuffer{$client} unless length $outbuffer{$client};              delete $outbuffer{$client} unless length $outbuffer{$client};
         } else {          } else {
             # Couldn't write all the data, and it wasn't because              # Couldn't write all the data, and it wasn't because
             # it would have blocked.  Shutdown and move on.              # it would have blocked.  Shutdown and move on.
   
       &logthis("Dropping data with ".$errno.": ".
                        length($outbuffer{$client}).", $rv");
   
             delete $inbuffer{$client};              delete $inbuffer{$client};
             delete $outbuffer{$client};              delete $outbuffer{$client};
             delete $ready{$client};              delete $ready{$client};
Line 489  sub nonblock { Line 537  sub nonblock {
             or die "Can't make socket nonblocking: $!\n";              or die "Can't make socket nonblocking: $!\n";
 }  }
   
   
   
   
   

Removed from v.1.6  
changed lines
  Added in v.1.15


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