--- loncom/lond	2000/12/05 20:19:46	1.28
+++ loncom/lond	2000/12/06 18:05:51	1.29
@@ -39,22 +39,6 @@ sub catchexception {
     die($error);
 }
 
-# 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)=@_;
-    $SIG{'QUIT'}='DEFAULT';
-    $SIG{__DIE__}='DEFAULT';
-    &logthis("<font color=red>CRITICAL: "
-     ."ABNORMAL EXIT. Child $$ for server $wasserver died through "
-     ."\_\_DIE\_\_ with this error msg->[$message]</font>");
-    if ($client) { print $client "error: $message\n"; }
-    die($message);
-}
-
 # -------------------------------- Set signal handlers to record abnormal exits
 
 $SIG{'QUIT'}=\&catchexception;
@@ -62,8 +46,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/) {
@@ -82,15 +65,14 @@ 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"; }
 }
 
 $PREFORK=4; # number of children to maintain, at least four spare
 
 # ------------------------------------------------------------- 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);
@@ -107,7 +89,7 @@ $server = IO::Socket::INET->new(LocalPor
                                 Proto     => 'tcp',
                                 Reuse     => 1,
                                 Listen    => 10 )
-  or catchdie "making socket: $@\n";
+  or die "making socket: $@\n";
 
 # --------------------------------------------------------- Do global variables
 
@@ -290,9 +272,9 @@ sub ishome {
 
 $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
 
@@ -331,14 +313,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} = 1;
         $children++;
         return;
@@ -348,7 +330,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";
 
         $tmpsnum=0;