--- loncom/loncron	2007/04/11 23:08:43	1.72
+++ loncom/loncron	2008/11/04 21:06:21	1.77
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.72 2007/04/11 23:08:43 albertel Exp $
+# $Id: loncron,v 1.77 2008/11/04 21:06:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,17 @@ sub errout {
 ENDERROUT
 }
 
+sub rotate_logfile {
+    my ($file,$fh,$description) = @_;
+    my $size=(stat($file))[7];
+    if ($size>40000) {
+	&log($fh,"<p>Rotating $description ...</p>");
+	rename("$file.2","$file.3");
+	rename("$file.1","$file.2");
+	rename("$file","$file.1");
+    } 
+}
+
 sub start_daemon {
     my ($fh,$daemon,$pidfile,$args) = @_;
     my $progname=$daemon;
@@ -69,12 +80,9 @@ sub start_daemon {
 	$progname='loncnew'; 
     }
     my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors";
-    my $size=(stat($error_fname))[7];
-    if ($size>40000) {
-	&log($fh,"<p>Rotating error logs ...</p>");
-	rename("$error_fname.2","$error_fname.3");
-	rename("$error_fname.1","$error_fname.2");
-	rename("$error_fname","$error_fname.1");
+    &rotate_logfile($error_fname,$fh,'error logs');
+    if ($daemon eq 'lonc') {
+	&clean_sockets($fh);
     }
     system("$perlvar{'lonDaemons'}/$progname 2>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
     sleep 1;
@@ -193,18 +201,7 @@ sub checkon_daemon {
     }
     
     my $fname="$perlvar{'lonDaemons'}/logs/$daemon.log";
-    
-    my ($dev,$ino,$mode,$nlink,
-	$uid,$gid,$rdev,$size,
-	$atime,$mtime,$ctime,
-	$blksize,$blocks)=stat($fname);
-    
-    if ($size>$maxsize) {
-	&log($fh,"<p>Rotating logs ...</p>");
-	rename("$fname.2","$fname.3");
-	rename("$fname.1","$fname.2");
-	rename("$fname","$fname.1");
-    }
+    &rotate_logfile($fname,$fh,'logs');
 
     &errout($fh);
     return $result;
@@ -307,7 +304,6 @@ sub start_logging {
 <li><a href="#lonsql">lonsql</a></li>
 <li><a href="#lond">lond</a></li>
 <li><a href="#lonc">lonc</a></li>
-<li><a href="#lonhttpd">lonhttpd</a></li>
 <li><a href="#lonnet">lonnet</a></li>
 <li><a href="#connections">Connections</a></li>
 <li><a href="#delayed">Delayed Messages</a></li>
@@ -404,6 +400,21 @@ sub clean_lonIDs {
     &log($fh,"<h3>$active open session(s)</h3>");
 }
 
+# ----------------------------------------------------------- clean out sockets
+sub clean_sockets {
+    my ($fh)=@_;
+    my $cleaned=0;
+    opendir(SOCKETS,$perlvar{'lonSockDir'});
+    while (my $fname=readdir(SOCKETS)) {
+	next if (-d $fname 
+		 || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/);
+	$cleaned++;
+	&log($fh,"Unlinking $fname<br />");
+	unlink("/home/httpd/sockets/$fname");
+    }
+    &log($fh,"<p>Cleaned up ".$cleaned." stale sockets.</p>");
+}
+
 
 # ----------------------------------------------------------------------- httpd
 sub check_httpd_logs {
@@ -450,23 +461,22 @@ sub rotate_lonnet_logs {
     } else { &log($fh,"No perm log\n") }
 
     my $fname="$perlvar{'lonDaemons'}/logs/lonnet.log";
-
-    my ($dev,$ino,$mode,$nlink,
-	$uid,$gid,$rdev,$size,
-	$atime,$mtime,$ctime,
-	$blksize,$blocks)=stat($fname);
-
-    if ($size>40000) {
-	&log($fh,"<p>Rotating logs ...</p>");
-	rename("$fname.2","$fname.3");
-	rename("$fname.1","$fname.2");
-	rename("$fname","$fname.1");
-    }
+    &rotate_logfile($fname,$fh,'lonnet log');
 
     &log($fh,"</pre>");
     &errout($fh);
 }
 
+sub rotate_other_logs {
+    my ($fh) = @_;
+    my $fname="$perlvar{'lonDaemons'}/logs/autoenroll.log";
+    &rotate_logfile($fname,$fh,'Auto Enroll log');
+    $fname="$perlvar{'lonDaemons'}/logs/autocreate.log";
+    &rotate_logfile($fname,$fh,'Create Course log');
+    $fname="$perlvar{'lonDaemons'}/logs/searchcat.log";
+    &rotate_logfile($fname,$fh,'Search Cataloguing log');
+}
+
 # ----------------------------------------------------------------- Connections
 sub test_connections {
     my ($fh)=@_;
@@ -565,7 +575,7 @@ sub finish_logging {
 }
 
 sub log_simplestatus {
-    rename ("$statusdir/newstatus.html","$statusdir/index.html");
+    rename("$statusdir/newstatus.html","$statusdir/index.html");
     
     my $sfh=IO::File->new(">$statusdir/loncron_simple.txt");
     foreach (keys %simplestatus) {
@@ -629,7 +639,7 @@ sub main () {
     undef $perlvarref;
     delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
     delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
-
+    chdir($perlvar{'lonDaemons'});
 # --------------------------------------- Make sure that LON-CAPA is configured
 # I only test for one thing here (lonHostID).  This is just a safeguard.
     if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
@@ -676,15 +686,15 @@ sub main () {
 	&clean_lonIDs($fh);
 	&check_httpd_logs($fh);
 	&rotate_lonnet_logs($fh);
+	&rotate_other_logs($fh);
     }
     if (!$justcheckconnections && !$justreload) {
+	&checkon_daemon($fh,'lonmemcached',40000);
 	&checkon_daemon($fh,'lonsql',200000);
 	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
 	    &checkon_daemon($fh,'lond',40000,'USR2');
 	}
 	&checkon_daemon($fh,'lonc',40000,'USR1');
-	&checkon_daemon($fh,'lonhttpd',40000);
-	&checkon_daemon($fh,'lonmemcached',40000);
         &checkon_daemon($fh,'lonmaxima',40000);
     }
     if ($justreload) {