--- loncom/loncron 2005/01/20 16:27:40 1.55 +++ loncom/loncron 2005/02/14 00:29:48 1.57 @@ -2,7 +2,7 @@ # Housekeeping program, started by cron, loncontrol and loncron.pl # -# $Id: loncron,v 1.55 2005/01/20 16:27:40 albertel Exp $ +# $Id: loncron,v 1.57 2005/02/14 00:29:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -114,7 +114,7 @@ sub checkon_daemon { my ($fh,$daemon,$maxsize,$sendusr1,$args)=@_; &log($fh,'

'.$daemon.'

Log

'); - printf("%-10s ",$daemon); + printf("%-15s ",$daemon); if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){ open (DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/$daemon.log|"); while (my $line=) { @@ -152,11 +152,13 @@ sub checkon_daemon { if ($restartflag==1) { $simplestatus{$daemon}='off'; $errors++; + my $kadaemon=$daemon; + if ($kadaemon eq 'lonmemcached') { $kadaemon='memcached'; } &log($fh,'
Killall '.$daemon.': '. - `killall $daemon 2>&1`.' - '); + `killall $kadaemon 2>&1`.' - '); sleep 2; &log($fh,unlink($pidfile).' - '. - `killall -9 $daemon 2>&1`. + `killall -9 $kadaemon 2>&1`. '
'); &log($fh,"

$daemon not running, trying to start

"); @@ -633,8 +635,9 @@ sub main () { my (%hostname,%hostdom,%hostrole,%spareid); while (my $configline=<$config>) { next if ($configline =~ /^(\#|\s*\$)/); - my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline); - if ($id && $domain && $role && $name && $ip) { + my ($id,$domain,$role,$name)=split(/:/,$configline); + if ($id && $domain && $role && $name) { + $name=~s/\s//g; $hostname{$id}=$name; $hostdom{$id}=$domain; $hostrole{$id}=$role; @@ -677,6 +680,7 @@ sub main () { if ($oldlonc) { $args = ''; } &checkon_daemon($fh,'lonc',40000,1,$args); &checkon_daemon($fh,'lonhttpd',40000); + &checkon_daemon($fh,'lonmemcached',40000); } if (!$justcheckdaemons) { &test_connections($fh,\%hostname);