--- loncom/Attic/lonc	2000/12/05 16:51:41	1.9
+++ loncom/Attic/lonc	2000/12/06 20:38:21	1.12
@@ -12,7 +12,10 @@
 
 # 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,
-# 2/8,7/25 Gerd Kortemeyer 
+# 2/8,7/25 Gerd Kortemeyer
+# 12/05 Scott Harrison
+# 12/05 Gerd Kortemeyer
+# 
 # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking
 
@@ -28,24 +31,14 @@ 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>");
+     ."\"$signal\" with this parameter->[$@]</font>");
     die($@);
 }
 
-# grabs exception and records it to log before exiting
-# NOTE: we must NOT use the regular (non-overrided) die function in
-# the code because a handler CANNOT be attached to it
-# (despite what some of the documentation says about SIG{__DIE__}.
-sub catchdie {
-    my ($message)=@_;
-    &logthis("<font color=red>CRITICAL: "
-     ."ABNORMAL EXIT. Child $$ for server $wasserver died through "
-     ."\_\_DIE\_\_ with this parameter->[$message]</font>");
-    die($message);
-}
-
 $childmaxattempts=10;
 
 # -------------------------------- Set signal handlers to record abnormal exits
@@ -55,8 +48,7 @@ $SIG{__DIE__}=\&catchexception;
 
 # ------------------------------------ Read httpd access.conf and get variables
 
-open (CONFIG,"/etc/httpd/conf/access.conf") 
-    || catchdie "Can't read access.conf";
+open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
 
 while ($configline=<CONFIG>) {
     if ($configline =~ /PerlSetVar/) {
@@ -75,13 +67,12 @@ if (-e $pidfile) {
    my $lfh=IO::File->new("$pidfile");
    my $pide=<$lfh>;
    chomp($pide);
-   if (kill 0 => $pide) { catchdie "already running"; }
+   if (kill 0 => $pide) { die "already running"; }
 }
 
 # ------------------------------------------------------------- Read hosts file
 
-open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") 
-    || catchdie "Can't read host file";
+open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
 
 while ($configline=<CONFIG>) {
     my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
@@ -124,6 +115,7 @@ sub HUPSMAN {                      # sig
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
     &logthis("<font color=red>CRITICAL: Restarting</font>");
+    unlink("$execdir/logs/lonc.pid");
     my $execdir=$perlvar{'lonDaemons'};
     exec("$execdir/lonc");         # here we go again
 }
@@ -182,9 +174,9 @@ sub logperm {
 
 $fpid=fork;
 exit if $fpid;
-catchdie "Couldn't fork: $!" unless defined ($fpid);
+die "Couldn't fork: $!" unless defined ($fpid);
 
-POSIX::setsid() or catchdie "Can't start new session: $!";
+POSIX::setsid() or die "Can't start new session: $!";
 
 # ------------------------------------------------------- Write our PID on disk
 
@@ -239,14 +231,14 @@ sub make_new_child {
     # block signal for fork
     $sigset = POSIX::SigSet->new(SIGINT);
     sigprocmask(SIG_BLOCK, $sigset)
-        or catchdie "Can't block SIGINT for fork: $!\n";
+        or die "Can't block SIGINT for fork: $!\n";
     
-    catchdie "fork: $!" unless defined ($pid = fork);
+    die "fork: $!" unless defined ($pid = fork);
     
     if ($pid) {
         # Parent records the child's birth and returns.
         sigprocmask(SIG_UNBLOCK, $sigset)
-            or catchdie "Can't unblock SIGINT for fork: $!\n";
+            or die "Can't unblock SIGINT for fork: $!\n";
         $children{$pid} = $conserver;
         $childpid{$conserver} = $pid;
         return;
@@ -256,7 +248,7 @@ sub make_new_child {
     
         # unblock signals
         sigprocmask(SIG_UNBLOCK, $sigset)
-            or catchdie "Can't unblock SIGINT for fork: $!\n";
+            or die "Can't unblock SIGINT for fork: $!\n";
 
 # ----------------------------- This is the modified main program of non-forker
 
@@ -300,7 +292,7 @@ $key=$key.$buildkey.$key.$buildkey.$key.
 $key=substr($key,0,32);
 my $cipherkey=pack("H32",$key);
 if ($cipher=new IDEA $cipherkey) {
-   &logthis("Secure connection inititalized: $conserver");
+   &logthis("Secure connection initialized: $conserver");
 } else {
    my $st=120+int(rand(240));
    &logthis(
@@ -523,8 +515,8 @@ sub nonblock {
 
     
     $flags = fcntl($socket, F_GETFL, 0)
-            or catchdie "Can't get flags for socket: $!\n";
+            or die "Can't get flags for socket: $!\n";
     fcntl($socket, F_SETFL, $flags | O_NONBLOCK)
-            or catchdie "Can't make socket nonblocking: $!\n";
+            or die "Can't make socket nonblocking: $!\n";
 }