[LON-CAPA-cvs] cvs: loncom / lonsql

[albertel]

albertel		Tue May 11 16:03:05 2004 EDT

  Modified files:              
    /loncom	lonsql 
  Log:
  
  -more xhtmlized
  
  
Index: loncom/lonsql
diff -u loncom/lonsql:1.58 loncom/lonsql:1.59
--- loncom/lonsql:1.58	Mon May  3 12:20:57 2004
+++ loncom/lonsql	Tue May 11 16:03:05 2004
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.58 2004/05/03 16:20:57 matthew Exp $
+# $Id: lonsql,v 1.59 2004/05/11 20:03:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -282,7 +282,7 @@
 open (PIDSAVE,">$execdir/logs/lonsql.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
-&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
+&logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");
 
 #
 # Ignore signals generated during initial startup
@@ -353,7 +353,7 @@
                                     $perlvar{'lonSqlAccess'},
                                     { RaiseError =>0,PrintError=>0})) { 
             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>");
                      #  "($st secs): $@</font>");
             print "database handle error\n";
@@ -421,7 +421,7 @@
         #
         # close the database handle
 	$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>");
         # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into
@@ -476,7 +476,7 @@
         #prepare and execute the query
         my $sth = $dbh->prepare($query);
         unless ($sth->execute()) {
-            &logthis('<font color=blue>'.
+            &logthis('<font color="blue">'.
                      'WARNING: Could not retrieve from database:'.
                      $sth->errstr().'</font>');
         } else {
@@ -910,7 +910,7 @@
     kill 'INT' => keys %children;
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lonsql.pid");
-    &logthis("<font color=red>CRITICAL: Shutting down</font>");
+    &logthis("<font color='red'>CRITICAL: Shutting down</font>");
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
     unlink($port);
@@ -921,7 +921,7 @@
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
     close($server);                # free up socket
-    &logthis("<font color=red>CRITICAL: Restarting</font>");
+    &logthis("<font color='red'>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     $unixsock = "mysqlsock";
     my $port="$perlvar{'lonSockDir'}/$unixsock";
@@ -931,7 +931,7 @@
 
 sub DISCONNECT {
     $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>");
     exit;
 }