version 1.58, 2004/05/03 16:20:57
|
version 1.61, 2004/05/20 14:15:29
|
Line 282 my $execdir=$perlvar{'lonDaemons'};
|
Line 282 my $execdir=$perlvar{'lonDaemons'};
|
open (PIDSAVE,">$execdir/logs/lonsql.pid"); |
open (PIDSAVE,">$execdir/logs/lonsql.pid"); |
print PIDSAVE "$$\n"; |
print PIDSAVE "$$\n"; |
close(PIDSAVE); |
close(PIDSAVE); |
&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>"); |
&logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>"); |
|
|
# |
# |
# Ignore signals generated during initial startup |
# Ignore signals generated during initial startup |
Line 353 sub make_new_child {
|
Line 353 sub make_new_child {
|
$perlvar{'lonSqlAccess'}, |
$perlvar{'lonSqlAccess'}, |
{ RaiseError =>0,PrintError=>0})) { |
{ RaiseError =>0,PrintError=>0})) { |
sleep(10+int(rand(20))); |
sleep(10+int(rand(20))); |
&logthis("<font color=blue>WARNING: Couldn't connect to database". |
&logthis("<font color='blue'>WARNING: Couldn't connect to database". |
": $@</font>"); |
": $@</font>"); |
# "($st secs): $@</font>"); |
# "($st secs): $@</font>"); |
print "database handle error\n"; |
print "database handle error\n"; |
Line 381 sub make_new_child {
|
Line 381 sub make_new_child {
|
$queryid .= $run; |
$queryid .= $run; |
print $client "$queryid\n"; |
print $client "$queryid\n"; |
# |
# |
&logthis("QUERY: $query - $arg1 - $arg2 - $arg3"); |
# &logthis("QUERY: $query - $arg1 - $arg2 - $arg3"); |
sleep 1; |
sleep 1; |
# |
# |
my $result=''; |
my $result=''; |
Line 413 sub make_new_child {
|
Line 413 sub make_new_child {
|
# result does not need to be escaped because it has already been |
# result does not need to be escaped because it has already been |
# escaped. |
# escaped. |
#$result=&escape($result); |
#$result=&escape($result); |
# reply with result, append \n unless already there |
|
$result.="\n" unless ($result=~/\n$/); |
|
&reply("queryreply:$queryid:$result",$conserver); |
&reply("queryreply:$queryid:$result",$conserver); |
} |
} |
# tidy up gracefully and finish |
# tidy up gracefully and finish |
# |
# |
# close the database handle |
# close the database handle |
$dbh->disconnect |
$dbh->disconnect |
or &logthis("<font color=blue>WARNING: Couldn't disconnect". |
or &logthis("<font color='blue'>WARNING: Couldn't disconnect". |
" from database $DBI::errstr : $@</font>"); |
" from database $DBI::errstr : $@</font>"); |
# this exit is VERY important, otherwise the child will become |
# this exit is VERY important, otherwise the child will become |
# a producer of more and more children, forking yourself into |
# a producer of more and more children, forking yourself into |
Line 476 sub do_sql_query {
|
Line 474 sub do_sql_query {
|
#prepare and execute the query |
#prepare and execute the query |
my $sth = $dbh->prepare($query); |
my $sth = $dbh->prepare($query); |
unless ($sth->execute()) { |
unless ($sth->execute()) { |
&logthis('<font color=blue>'. |
&logthis('<font color="blue">'. |
'WARNING: Could not retrieve from database:'. |
'WARNING: Could not retrieve from database:'. |
$sth->errstr().'</font>'); |
$sth->errstr().'</font>'); |
} else { |
} else { |
Line 910 sub HUNTSMAN { # si
|
Line 908 sub HUNTSMAN { # si
|
kill 'INT' => keys %children; |
kill 'INT' => keys %children; |
my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
unlink("$execdir/logs/lonsql.pid"); |
unlink("$execdir/logs/lonsql.pid"); |
&logthis("<font color=red>CRITICAL: Shutting down</font>"); |
&logthis("<font color='red'>CRITICAL: Shutting down</font>"); |
$unixsock = "mysqlsock"; |
$unixsock = "mysqlsock"; |
my $port="$perlvar{'lonSockDir'}/$unixsock"; |
my $port="$perlvar{'lonSockDir'}/$unixsock"; |
unlink($port); |
unlink($port); |
Line 921 sub HUPSMAN { # sig
|
Line 919 sub HUPSMAN { # sig
|
local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children |
local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children |
kill 'INT' => keys %children; |
kill 'INT' => keys %children; |
close($server); # free up socket |
close($server); # free up socket |
&logthis("<font color=red>CRITICAL: Restarting</font>"); |
&logthis("<font color='red'>CRITICAL: Restarting</font>"); |
my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
$unixsock = "mysqlsock"; |
$unixsock = "mysqlsock"; |
my $port="$perlvar{'lonSockDir'}/$unixsock"; |
my $port="$perlvar{'lonSockDir'}/$unixsock"; |
Line 931 sub HUPSMAN { # sig
|
Line 929 sub HUPSMAN { # sig
|
|
|
sub DISCONNECT { |
sub DISCONNECT { |
$dbh->disconnect or |
$dbh->disconnect or |
&logthis("<font color=blue>WARNING: Couldn't disconnect from database ". |
&logthis("<font color='blue'>WARNING: Couldn't disconnect from database ". |
" $DBI::errstr : $@</font>"); |
" $DBI::errstr : $@</font>"); |
exit; |
exit; |
} |
} |