--- loncom/Attic/lonc	2000/07/25 16:03:57	1.7
+++ loncom/Attic/lonc	2000/12/05 03:23:59	1.8
@@ -27,9 +27,15 @@ use Crypt::IDEA;
 
 $childmaxattempts=10;
 
+# -------------------------------- Set signal handlers to record abnormal exits
+
+$SIG{'QUIT'}=\&catchexception;
+$SIG{__DIE__}=\&catchexception;
+
 # ------------------------------------ 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") 
+    || catchdie "Can't read access.conf";
 
 while ($configline=<CONFIG>) {
     if ($configline =~ /PerlSetVar/) {
@@ -48,12 +54,13 @@ if (-e $pidfile) {
    my $lfh=IO::File->new("$pidfile");
    my $pide=<$lfh>;
    chomp($pide);
-   if (kill 0 => $pide) { die "already running"; }
+   if (kill 0 => $pide) { catchdie "already running"; }
 }
 
 # ------------------------------------------------------------- Read hosts file
 
-open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
+open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") 
+    || catchdie "Can't read host file";
 
 while ($configline=<CONFIG>) {
     my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
@@ -154,9 +161,9 @@ sub logperm {
 
 $fpid=fork;
 exit if $fpid;
-die "Couldn't fork: $!" unless defined ($fpid);
+catchdie "Couldn't fork: $!" unless defined ($fpid);
 
-POSIX::setsid() or die "Can't start new session: $!";
+POSIX::setsid() or catchdie "Can't start new session: $!";
 
 # ------------------------------------------------------- Write our PID on disk
 
@@ -211,14 +218,14 @@ sub make_new_child {
     # block signal for fork
     $sigset = POSIX::SigSet->new(SIGINT);
     sigprocmask(SIG_BLOCK, $sigset)
-        or die "Can't block SIGINT for fork: $!\n";
+        or catchdie "Can't block SIGINT for fork: $!\n";
     
-    die "fork: $!" unless defined ($pid = fork);
+    catchdie "fork: $!" unless defined ($pid = fork);
     
     if ($pid) {
         # Parent records the child's birth and returns.
         sigprocmask(SIG_UNBLOCK, $sigset)
-            or die "Can't unblock SIGINT for fork: $!\n";
+            or catchdie "Can't unblock SIGINT for fork: $!\n";
         $children{$pid} = $conserver;
         $childpid{$conserver} = $pid;
         return;
@@ -228,7 +235,7 @@ sub make_new_child {
     
         # unblock signals
         sigprocmask(SIG_UNBLOCK, $sigset)
-            or die "Can't unblock SIGINT for fork: $!\n";
+            or catchdie "Can't unblock SIGINT for fork: $!\n";
 
 # ----------------------------- This is the modified main program of non-forker
 
@@ -495,12 +502,29 @@ sub nonblock {
 
     
     $flags = fcntl($socket, F_GETFL, 0)
-            or die "Can't get flags for socket: $!\n";
+            or catchdie "Can't get flags for socket: $!\n";
     fcntl($socket, F_SETFL, $flags | O_NONBLOCK)
-            or die "Can't make socket nonblocking: $!\n";
+            or catchdie "Can't make socket nonblocking: $!\n";
 }
 
+# grabs exception and records it to log before exiting
+sub catchexception {
+    my ($signal)=@_;
+    &logthis("<font color=red>CRITICAL: "
+     ."ABNORMAL EXIT. Child $$ for server $wasserver died through "
+     ."$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);
+}