Changeset 423 for branches/1.1dev/config

Timestamp:

Aug 13, 2013 11:52:52 PM (11 years ago)

Author:

anonymous

Message:

Backporting fixes to v1.1

File:

• branches/1.1dev/config/boot.inc.php (modified) (2 diffs)

branches/1.1dev/config/boot.inc.php

@@ -76 +76 @@
     
     // Connect to MySQL
-    $dbh = mysql_connect('localhost', $CFG->username, $CFG->password);
-    
-    // Select database
-    mysql_select_db($CFG->database, $dbh);
+    if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
+        // Select database
+        mysql_select_db($CFG->database, $dbh);        
+    }
 
     // Connection errors.
@@ -109 +109 @@
             echo "<!-- --------------------------------------\n" . $debugqry . "\n-->";
         }
+        
+        // Ensure we have an active connection. 
+        // If we continue on a dead connection we might experience a "MySQL server has gone away" error.
+        // http://dev.mysql.com/doc/refman/5.0/en/gone-away.html
+        // Unfortunately we'll have redundant code with the reconnection below.
+        if (!mysql_ping($dbh)) {
+            logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_NOTICE, __FILE__, __LINE__);
+            mysql_close($dbh);
+            if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
+                mysql_select_db($CFG->database, $dbh);        
+            }
+            if (!$dbh || mysql_error($dbh)) {
+                $mysql_error_msg = $dbh ? 'Codebase MySQL error: (' . mysql_errno($dbh) . ') ' . mysql_error($dbh) : 'Codebase MySQL error: Could not connect to server.';
+                if ($CFG->db_debug) {
+                    echo $mysql_error_msg . "\n";
+                } else {
+                    echo _("This page is temporarily unavailable. It should be back up in a few minutes.");
+                }
+                logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
+                die;
+            }
+        }
+
         $qid = mysql_query($query, $dbh);
         if (!$qid || mysql_error($dbh)) {