[LON-CAPA-cvs] cvs: loncom / loncron

raeburn raeburn at source.lon-capa.org
Sat Jan 30 16:26:04 EST 2021


raeburn		Sat Jan 30 21:26:04 2021 EDT

  Modified files:              
    /loncom	loncron 
  Log:
  - Remove trailing white space.  No code changes.
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.124 loncom/loncron:1.125
--- loncom/loncron:1.124	Sat May  9 19:17:33 2020
+++ loncom/loncron	Sat Jan 30 21:26:04 2021
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.124 2020/05/09 19:17:33 raeburn Exp $
+# $Id: loncron,v 1.125 2021/01/30 21:26:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,14 +80,14 @@
 	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;
     if ($daemon eq 'lonc') {
-	$progname='loncnew'; 
+	$progname='loncnew';
     }
     my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors";
     &rotate_logfile($error_fname,$fh,'error logs');
@@ -121,7 +121,7 @@
     if ($fh) {
         if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){
 	    if (open(DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/$daemon.log|")) {
-	        while (my $line=<DFH>) { 
+	        while (my $line=<DFH>) {
 	            &log($fh,"$line");
 	            if ($line=~/INFO/) { $notices++; }
 	            if ($line=~/WARNING/) { $notices++; }
@@ -132,9 +132,9 @@
         }
         &log($fh,"</tt></p>");
     }
-    
+
     my $pidfile="$perlvar{'lonDaemons'}/logs/$daemon.pid";
-    
+ 
     my $restartflag=1;
     my $daemonpid;
     if (-e $pidfile) {
@@ -217,7 +217,7 @@
             }
 	}
     }
-    
+
     my $fname="$perlvar{'lonDaemons'}/logs/$daemon.log";
     &rotate_logfile($fname,$fh,'logs');
 
@@ -230,13 +230,13 @@
     my ($fh)=@_;
     &log($fh,'<hr /><a name="machine" /><h2>Machine Information</h2>');
     &log($fh,"<h3>loadavg</h3>");
-	
+
     open (LOADAVGH,"/proc/loadavg");
     my $loadavg=<LOADAVGH>;
     close (LOADAVGH);
-    
+ 
     &log($fh,"<tt>$loadavg</tt>");
-    
+
     my @parts=split(/\s+/,$loadavg);
     if ($parts[1]>4.0) {
 	$errors++;
@@ -250,14 +250,14 @@
     &log($fh,"<pre>");
 
     open (DFH,"df|");
-    while (my $line=<DFH>) { 
-	&log($fh,&encode_entities($line,'<>&"')); 
+    while (my $line=<DFH>) {
+	&log($fh,&encode_entities($line,'<>&"'));
 	@parts=split(/\s+/,$line);
 	my $usage=$parts[4];
 	$usage=~s/\W//g;
-	if ($usage>90) { 
+	if ($usage>90) {
 	    $warnings++;
-	    $notices++; 
+	    $notices++;
 	} elsif ($usage>80) {
 	    $warnings++;
 	} elsif ($usage>60) {
@@ -274,8 +274,8 @@
     my $psproc=0;
 
     open (PSH,"ps aux --cols 140 |");
-    while (my $line=<PSH>) { 
-	&log($fh,&encode_entities($line,'<>&"')); 
+    while (my $line=<PSH>) {
+	&log($fh,&encode_entities($line,'<>&"'));
 	$psproc++;
     }
     close (PSH);
@@ -297,7 +297,7 @@
     my %simplestatus=();
     my $now=time;
     my $date=localtime($now);
-    
+ 
 
     &log($fh,(<<ENDHEADERS));
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -413,12 +413,12 @@
                 ($cleaned,$old,$removed) = 
                      &recursive_clean_tmp($innerdir,$cleaned,$old,$removed,$errors);
                 my @doms = &Apache::lonnet::current_machine_domains();
-                
+
                 if (open(my $dirhandle,$fname)) {
                     unless (($innerdir eq 'helprequests') ||
                             (($innerdir =~ /^addcourse/) && ($innerdir !~ m{/\d+$}))) {
                         my @contents = grep {!/^\.\.?$/} readdir($dirhandle);
-                                      join('&&', at contents)."\n";    
+                                      join('&&', at contents)."\n";
                         if (scalar(grep {!/^\.\.?$/} readdir($dirhandle)) == 0) {
                             closedir($dirhandle);
                             if ($fname =~ m{^\Q$perlvar{'lonDaemons'}\E/tmp/}) {
@@ -471,7 +471,7 @@
                                 }
                             }
                         } elsif (ref($errors->{failopen}) eq 'ARRAY') {
-                            push(@{$errors->{failopen}},$fname); 
+                            push(@{$errors->{failopen}},$fname);
                         }
                     } else {
                         if (unlink($fname)) {
@@ -653,16 +653,16 @@
     print "Checking logs.\n";
     if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){
 	open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
-	while (my $line=<DFH>) { 
+	while (my $line=<DFH>) {
 	    &log($fh,&encode_entities($line,'<>&"'));
 	}
 	close (DFH);
     }
     &log($fh,"</pre><h3>Perm Log</h3><pre>");
-    
+
     if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
 	open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");
-	while (my $line=<DFH>) { 
+	while (my $line=<DFH>) {
 	    &log($fh,&encode_entities($line,'<>&"'));
 	}
 	close (DFH);
@@ -1032,7 +1032,7 @@
                 eval {
                     local $SIG{ ALRM } = sub { die "TIMEOUT" };
                     alarm(10);
-                    $serverhomeID = 
+                    $serverhomeID =
                         &Apache::lonnet::get_server_homeID($name,1,'loncron');
                     alarm(0);
                 };
@@ -1167,7 +1167,7 @@
 
 sub clean_nosslverify {
     my ($fh) = @_;
-    my %unlinked; 
+    my %unlinked;
     if (-d "$perlvar{'lonSockDir'}/nosslverify") {
         if (opendir(my $dh,"$perlvar{'lonSockDir'}/nosslverify")) {
             while (my $fname=readdir($dh)) {
@@ -1329,7 +1329,7 @@
                 foreach my $lonid (sort(keys(%hostdom))) {
                     my $type = 'other';
                     if ($hostdom{$lonid} eq $dom) {
-                        $type = 'dom'; 
+                        $type = 'dom';
                     } elsif ($intdom{$lonid} eq $internetdom) {
                         $type = 'intdom';
                     }
@@ -1608,7 +1608,7 @@
         &Apache::lonnet::get_iphost(1,$nomemcache);
     }
 
-# ----------------------------------------- Force firewall update for lond port  
+# ----------------------------------------- Force firewall update for lond port
 
     if ((!$justcheckdaemons) && (!$justreload)) {
         my $now = time;
@@ -1623,7 +1623,7 @@
             if (&LONCAPA::try_to_lock('/tmp/lock_lciptables')) {
                 my $execpath = $perlvar{'lonDaemons'}.'/lciptables';
                 system("$execpath $tmpfile");
-                unlink('/tmp/lock_lciptables');  # Remove the lock file. 
+                unlink('/tmp/lock_lciptables');  # Remove the lock file.
             }
             unlink($tmpfile);
         }
@@ -1635,7 +1635,7 @@
     $warnings=0;
     $notices=0;
 
-	
+
     my $fh;
     if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
 	$fh=&start_logging();




More information about the LON-CAPA-cvs mailing list