--- loncom/Attic/lonc	1999/11/18 19:52:46	1.3
+++ loncom/Attic/lonc	2000/02/10 23:20:13	1.6
@@ -11,7 +11,8 @@
 # USR1 tries to open connections again
 
 # 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 Gerd Kortemeyer 
+# 10/8,10/9,10/15,11/18,12/22,
+# 2/8 Gerd Kortemeyer 
 # based on nonforker from Perl Cookbook
 # - server who multiplexes without forking
 
@@ -24,6 +25,8 @@ use Fcntl;
 use Tie::RefHash;
 use Crypt::IDEA;
 
+$childmaxattempts=10;
+
 # ------------------------------------ Read httpd access.conf and get variables
 
 open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
@@ -31,6 +34,7 @@ open (CONFIG,"/etc/httpd/conf/access.con
 while ($configline=<CONFIG>) {
     if ($configline =~ /PerlSetVar/) {
 	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+        chomp($varvalue);
         $perlvar{$varname}=$varvalue;
     }
 }
@@ -60,7 +64,8 @@ sub REAPER {                        # ta
     $SIG{CHLD} = \&REAPER;
     my $pid = wait;
     my $wasserver=$children{$pid};
-    &logthis("Child $pid for server $wasserver died");
+    &logthis("<font color=red>CRITICAL: "
+     ."Child $pid for server $wasserver died ($childatt{$wasserver})</font>");
     delete $children{$pid};
     delete $childpid{$wasserver};
     my $port = "$perlvar{'lonSockDir'}/$wasserver";
@@ -72,31 +77,33 @@ sub HUNTSMAN {                      # si
     kill 'INT' => keys %children;
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lonc.pid");
-    &logthis("Shutting down");
+    &logthis("<font color=red>CRITICAL: Shutting down</font>");
     exit;                           # clean up with dignity
 }
 
 sub HUPSMAN {                      # signal handler for SIGHUP
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
-    &logthis("Restarting");
+    &logthis("<font color=red>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     exec("$execdir/lonc");         # here we go again
 }
 
 sub USRMAN {
-    %childatt=();
     &logthis("USR1: Trying to establish connections again");
     foreach $thisserver (keys %hostip) {
 	$answer=subreply("ping",$thisserver);
-        &logthis(
-          "USR1: Ping $thisserver (pid >$childpid{$thisserver}<): >$answer<");
+        &logthis("USR1: Ping $thisserver "
+        ."(pid >$childpid{$thisserver}<, $childatt{thisserver} attempts): "
+        ." >$answer<");
     }
+    %childatt=();
 }
 
 # -------------------------------------------------- Non-critical communication
 sub subreply { 
  my ($cmd,$server)=@_;
+ my $answer='';
  if ($server ne $perlvar{'lonHostID'}) { 
     my $peerfile="$perlvar{'lonSockDir'}/$server";
     my $sclient=IO::Socket::UNIX->new(Peer    =>"$peerfile",
@@ -146,7 +153,7 @@ $execdir=$perlvar{'lonDaemons'};
 open (PIDSAVE,">$execdir/logs/lonc.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
-&logthis("---------- Starting ----------");
+&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
 
 # ----------------------------- Ignore signals generated during initial startup
 $SIG{HUP}=$SIG{USR1}='IGNORE';
@@ -172,9 +179,12 @@ while (1) {
                                     # See who died and start new one
     foreach $thisserver (keys %hostip) {
         if (!$childpid{$thisserver}) {
-	    if ($childatt{$thisserver}<5) {
+	    if ($childatt{$thisserver}<=$childmaxattempts) {
+	       $childatt{$thisserver}++;
+               &logthis(
+   "<font color=yellow>INFO: Trying to reconnect for $thisserver "
+  ."($childatt{$thisserver} of $childmaxattempts attempts)</font>"); 
                make_new_child($thisserver);
-               $childatt{$thisserver}++;
 	    }
         }       
     }
@@ -220,8 +230,11 @@ unless (
                                       PeerPort => $perlvar{'londPort'},
                                       Proto    => "tcp",
                                       Type     => SOCK_STREAM)
-   ) { &logthis("Couldn't connect $conserver: $@");
-       sleep(5);
+   ) { 
+       my $st=120+int(rand(240));
+       &logthis(
+"<font color=blue>WARNING: Couldn't connect $conserver ($st secs): $@</font>");
+       sleep($st);
        exit; 
      };
 # --------------------------------------- Send a ping to make other end do USR1
@@ -250,20 +263,30 @@ my $cipherkey=pack("H32",$key);
 if ($cipher=new IDEA $cipherkey) {
    &logthis("Secure connection inititalized: $conserver");
 } else {
-   &logthis("Error: Could not establish secure connection, $conserver!");
+   my $st=120+int(rand(240));
+   &logthis(
+     "<font color=blue>WARNING: ".
+     "Could not establish secure connection, $conserver ($st secs)!</font>");
+   sleep($st);
+   exit;
 }
 
 # ----------------------------------------- We're online, send delayed messages
 
+    my @allbuffered;
     my $path="$perlvar{'lonSockDir'}/delayed";
+    opendir(DIRHANDLE,$path);
+    @allbuffered=grep /\.$conserver$/, readdir DIRHANDLE;
+    closedir(DIRHANDLE);
     my $dfname;
-    while ($dfname=<$path/*.$conserver>) {
+    map {
+        $dfname="$path/$_";
+        &logthis($dfname);
         my $wcmd;
         {
          my $dfh=IO::File->new($dfname);
-         $wcmd=<$dfh>;
+         $cmd=<$dfh>;
         }
-        my ($server,$cmd)=split(/:/,$wcmd);
         chomp($cmd);
         my $bcmd=$cmd;
         if ($cmd =~ /^encrypt\:/) {
@@ -285,23 +308,30 @@ if ($cipher=new IDEA $cipherkey) {
 	chomp($answer);
         if ($answer ne '') {
 	    unlink("$dfname");
-            &logthis("Delayed $cmd to $conserver ($server): >$answer<");
+            &logthis("Delayed $cmd to $conserver: >$answer<");
             &logperm("S:$conserver:$bcmd");
         }        
-    }
+    } @allbuffered;
 
 # ------------------------------------------------------- Listen to UNIX socket
 unless (
   $server = IO::Socket::UNIX->new(Local  => $port,
                                   Type   => SOCK_STREAM,
                                   Listen => 10 )
-   ) { &logthis("Can't make server socket $conserver: $@");
-       sleep(5);
+   ) { 
+       my $st=120+int(rand(240));
+       &logthis(
+         "<font color=blue>WARNING: ".
+         "Can't make server socket $conserver ($st secs): $@</font>");
+       sleep($st);
        exit; 
      };
 
 # -----------------------------------------------------------------------------
 
+&logthis("<font color=green>$conserver online</font>");
+
+# -----------------------------------------------------------------------------
 # begin with empty buffers
 %inbuffer  = ();
 %outbuffer = ();