--- loncom/loncron 2001/09/06 19:28:06 1.24 +++ loncom/loncron 2002/05/17 16:19:24 1.27 @@ -13,10 +13,15 @@ # 12/23 Gerd Kortemeyer # YEAR=2001 # 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison -# 09/04,09/06 Gerd Kortemeyer +# 09/04,09/06,11/26 Gerd Kortemeyer +# YEAR=2002 +# 5/11/2002 Scott Harrison $|=1; +use lib '/home/httpd/lib/perl/'; +use LONCAPA::Configuration; + use IO::File; use IO::Socket; @@ -50,19 +55,13 @@ ENDERROUT # ================================================================ Main Program -# ------------------------------------------------------------ Read access.conf -{ - my $config=IO::File->new("/etc/httpd/conf/access.conf"); - - while (my $configline=<$config>) { - if ($configline =~ /PerlSetVar/) { - my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); - $perlvar{$varname}=$varvalue; - } - } - delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed - delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed -} +# --------------------------------- Read loncapa_apache.conf and loncapa.conf +my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf', + 'loncapa.conf'); +my %perlvar=%{$perlvarref}; +undef $perlvarref; +delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed +delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed # --------------------------------------- Make sure that LON-CAPA is configured # I only test for one thing here (lonHostID). This is just a safeguard. @@ -422,7 +421,8 @@ if (-e $londfile) { my $londpid=<$lfh>; chomp($londpid); if (kill 0 => $londpid) { - print $fh "

lond at pid $londpid responding

"; + print $fh "

lond at pid $londpid responding, sending USR1

"; + kill USR1 => $londpid; $restartflag=0; } else { $errors++;