--- loncom/loncron 2018/08/07 17:12:09 1.107 +++ loncom/loncron 2018/10/25 02:48:56 1.109 @@ -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.109 2018/10/25 02:48:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1028,7 +1028,7 @@ sub update_revocation_list { } sub reset_nosslverify_pids { - my (%sslrem) = @_; + my ($fh,%sslrem) = @_; &checkon_daemon($fh,'lond',40000,'USR2'); my $loncpidfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; my $loncppid; @@ -1057,8 +1057,8 @@ sub reset_nosslverify_pids { if ($sslrem{$host}) { if (ref($pids_by_host{$host}) eq 'HASH') { if (ref($pids_by_host{$host}{'insecure'}) eq 'HASH') { - if (keys($pids_by_host{$host}{'insecure'})) { - foreach my $pid (keys($pids_by_host{$host}{'insecure'})) { + if (keys(%{$pids_by_host{$host}{'insecure'}})) { + foreach my $pid (keys(%{$pids_by_host{$host}{'insecure'}})) { if (open(PIPE,"ps -o ppid= -p $pid |")) { my $ppid = ; chomp($ppid); @@ -1274,15 +1274,15 @@ sub main () { &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(); } } }