[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / loncron

[raeburn]

raeburn		Thu Aug  1 18:21:36 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	loncron 
  Log:
  - For 2.11
    Backport 1.115
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.103.2.4 loncom/loncron:1.103.2.5
--- loncom/loncron:1.103.2.4	Sun Jul  7 16:15:24 2019
+++ loncom/loncron	Thu Aug  1 18:21:36 2019
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.103.2.4 2019/07/07 16:15:24 raeburn Exp $
+# $Id: loncron,v 1.103.2.5 2019/08/01 18:21:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,6 +506,34 @@
     &log($fh,"<h3>$active open session(s)</h3>");
 }
 
+# -------------------------------------------------------- clean out balanceIDs
+
+sub clean_balanceIDs {
+    my ($fh)=@_;
+    &log($fh,'<hr /><a name="balcookies" /><h2>Session Tokens</h2>');
+    my $cleaned=0;
+    my $active=0;
+    if (-d $perlvar{'lonBalanceDir'}) {
+        while (my $fname=<$perlvar{'balanceDir'}/*.id>) {
+            my ($dev,$ino,$mode,$nlink,
+                $uid,$gid,$rdev,$size,
+                $atime,$mtime,$ctime,
+                $blksize,$blocks)=stat($fname);
+            my $now=time;
+            my $since=$now-$mtime;
+            if ($since>$perlvar{'lonExpire'}) {
+                $cleaned++;
+                &log($fh,"Unlinking $fname<br />");
+                unlink("$fname");
+            } else {
+                $active++;
+            }
+        }
+    }
+    &log($fh,"<p>Cleaned up ".$cleaned." stale balancer files</p>");
+    &log($fh,"<h3>$active unexpired balancer files</h3>");
+}
+
 # ------------------------------------------------ clean out webDAV Session IDs
 sub clean_webDAV_sessionIDs {
     my ($fh)=@_;
@@ -1078,6 +1106,7 @@
 	&log_machine_info($fh);
 	&clean_tmp($fh);
 	&clean_lonIDs($fh);
+        &clean_balanceIDs($fh);
         &clean_webDAV_sessionIDs($fh);
 	&check_httpd_logs($fh);
 	&rotate_lonnet_logs($fh);