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

[raeburn]

raeburn		Wed Aug  8 11:49:48 2018 EDT

  Modified files:              
    /loncom	loncron 
  Log:
  - Fix syntax errors in rev. 1.107
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.107 loncom/loncron:1.108
--- loncom/loncron:1.107	Tue Aug  7 17:12:09 2018
+++ loncom/loncron	Wed Aug  8 11:49:48 2018
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.107 2018/08/07 17:12:09 raeburn Exp $
+# $Id: loncron,v 1.108 2018/08/08 11:49:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1028,7 +1028,7 @@
 }
 
 sub reset_nosslverify_pids {
-    my (%sslrem) = @_;
+    my ($fh,%sslrem) = @_;
     &checkon_daemon($fh,'lond',40000,'USR2');
     my $loncpidfile="$perlvar{'lonDaemons'}/logs/lonc.pid";
     my $loncppid;
@@ -1274,15 +1274,15 @@
         &write_serverhomeIDs();
 	&write_checksums();
         my %sslrem = &clean_nosslverify($fh);
-        &finish_logging($fh);
         my %conchgs = &write_connection_config();
         my %hosttypechgs = &write_hosttypes();
         my $hadcrlchg = &update_revocation_list();
-        if ((keys(%{$conchgs}) > 0) || (keys(%hosttypechgs) > 0) ||
+        if ((keys(%conchgs) > 0) || (keys(%hosttypechgs) > 0) ||
             $hadcrlchg || (keys(%sslrem) > 0)) {
             &checkon_daemon($fh,'lond',40000,'USR2');
-            &reset_nosslverify_pids(%sslrem);
+            &reset_nosslverify_pids($fh,%sslrem);
         }
+        &finish_logging($fh);
 	if ($totalcount>200 && !$noemail) { &send_mail(); }
     }
 }