--- loncom/loncron 2001/04/24 15:55:13 1.21 +++ loncom/loncron 2001/08/27 13:54:50 1.22 @@ -11,7 +11,8 @@ # 2/8 Gerd Kortemeyer # 12/6/2000,12/8 Scott Harrison # 12/23 Gerd Kortemeyer -# 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21 Scott Harrison +# YEAR=2001 +# 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison use IO::File; use IO::Socket; @@ -283,9 +284,8 @@ print $fh ""; # ---------------------------------------------------------------------- lonsql -# -# Do not run for now -# + +my $restartflag=1; if ($perlvar{'lonRole'} eq "library") { print $fh '

lonsql

Log

';
@@ -310,11 +310,31 @@ if ($perlvar{'lonRole'} eq "library") {
 	chomp($lonsqlpid);
 	if (kill 0 => $lonsqlpid) {
 	    print $fh "

lonsql at pid $lonsqlpid responding

"; + $restartflag=0; } else { $errors++; $errors++; print $fh "

lonsql at pid $lonsqlpid not responding

"; + # Intelligently handle this. + # Possibility #1: there is no process + # Solution: remove .pid file and restart + if (getpgrp($lonsqlpid)==-1) { + unlink($lonsqlfile); + $restartflag=1; + } + else { + # Possibility #2: there is a live process that is not + # responding for an unknown reason + # Solution: kill parent and children processes, remove .pid + # and restart + `killall -9 lonsql`; + unlink($lonsqlfile); + $restartflag=1; + } } - } else { + print $fh + "

Deciding to clean up stale .pid file and restart lonsql

"; + } + if ($restartflag==1) { $errors++; print $fh "

lonsql not running, trying to start

"; system( @@ -387,7 +407,7 @@ print $fh "
"; my $londfile="$perlvar{'lonDaemons'}/logs/lond.pid"; -my $restartflag=1; +$restartflag=1; if (-e $londfile) { my $lfh=IO::File->new("$londfile"); my $londpid=<$lfh>;