version 1.63, 2004/07/28 20:46:28
|
version 1.67, 2005/04/13 18:39:13
|
Line 211 my $conf_file = '/home/www/.my.cnf';
|
Line 211 my $conf_file = '/home/www/.my.cnf';
|
if (! -e $conf_file) { |
if (! -e $conf_file) { |
if (open MYCNF, ">$conf_file") { |
if (open MYCNF, ">$conf_file") { |
print MYCNF <<"ENDMYCNF"; |
print MYCNF <<"ENDMYCNF"; |
# Generated by LON-CAPA |
|
# |
|
# This file is edited automatically |
|
# Put your configuration below the LON-CAPA configuration code |
|
# |
|
# BEGIN LON-CAPA Specific configuration code |
|
[client] |
[client] |
user=www |
user=www |
password=$perlvar{'lonSqlAccess'} |
password=$perlvar{'lonSqlAccess'} |
# END LON-CAPA Specific configuration code |
|
# |
|
# Place your own configuration code below the next line |
|
#------------------------------------------------- |
|
ENDMYCNF |
ENDMYCNF |
|
|
close MYCNF; |
close MYCNF; |
} else { |
} else { |
warn "Unable to write $conf_file, continuing"; |
warn "Unable to write $conf_file, continuing"; |
} |
} |
} else { |
|
# it exists. FIXME: Need to ensure we have current password in it... |
|
# my @Original = `cat $conf_file`; |
|
# if ($Original[0] =~ /^\# Generated by LON-CAPA/ ) { |
|
# if (! open MYCNF, ">$conf_file") { |
|
# } |
|
} |
} |
|
|
|
|
Line 258 unless ($dbh = DBI->connect("DBI:mysql:l
|
Line 241 unless ($dbh = DBI->connect("DBI:mysql:l
|
|
|
exit 1; |
exit 1; |
} else { |
} else { |
|
unlink('/home/httpd/html/lon-status/mysql.txt'); |
$dbh->disconnect; |
$dbh->disconnect; |
} |
} |
|
|
Line 275 if (-e $pidfile) {
|
Line 259 if (-e $pidfile) {
|
# |
# |
# Read hosts file |
# Read hosts file |
# |
# |
my %hostip; |
|
my $thisserver; |
my $thisserver; |
my $PREFORK=4; # number of children to maintain, at least four spare |
my $PREFORK=4; # number of children to maintain, at least four spare |
open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file"; |
open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file"; |
while (my $configline=<CONFIG>) { |
while (my $configline=<CONFIG>) { |
my ($id,$domain,$role,$name,$ip)=split(/:/,$configline); |
my ($id,$domain,$role,$name)=split(/:/,$configline); |
chomp($ip); |
$name=~s/\s//g; |
$hostip{$ip}=$id; |
|
$thisserver=$name if ($id eq $perlvar{'lonHostID'}); |
$thisserver=$name if ($id eq $perlvar{'lonHostID'}); |
$PREFORK++; |
#$PREFORK++; |
} |
} |
close(CONFIG); |
close(CONFIG); |
# |
# |
$PREFORK=int($PREFORK/4); |
#$PREFORK=int($PREFORK/4); |
|
|
# |
# |
# Create a socket to talk to lond |
# Create a socket to talk to lond |
Line 460 sub make_new_child {
|
Line 442 sub make_new_child {
|
} |
} |
} elsif ($query eq 'prepare activity log') { |
} elsif ($query eq 'prepare activity log') { |
my ($cid,$domain) = map {&unescape($_);} ($arg1,$arg2); |
my ($cid,$domain) = map {&unescape($_);} ($arg1,$arg2); |
|
&logthis('preparing activity log tables for '.$cid); |
my $command = |
my $command = |
qq{parse_activity_log.pl -course=$cid -domain=$domain}; |
qq{$perlvar{'lonDaemons'}/parse_activity_log.pl -course=$cid -domain=$domain}; |
system($command); |
system($command); |
|
&logthis($command); |
my $returnvalue = $?>>8; |
my $returnvalue = $?>>8; |
if ($returnvalue) { |
if ($returnvalue) { |
$result = 'error: parse_activity_log.pl returned '. |
$result = 'error: parse_activity_log.pl returned '. |
Line 524 sub process_file {
|
Line 508 sub process_file {
|
|
|
sub do_sql_query { |
sub do_sql_query { |
my ($query,$custom,$customshow) = @_; |
my ($query,$custom,$customshow) = @_; |
|
&logthis('doing query '.$query); |
$custom = &unescape($custom); |
$custom = &unescape($custom); |
$customshow = &unescape($customshow); |
$customshow = &unescape($customshow); |
# |
# |