Changeset 1059 for trunk/common

Timestamp:

11/04/09 00:52:17 (3 years ago)

Author:

bogdan2412

Message:

Fix database connection "keep alive".

This should fix the eval crashing when it is unable to connect to the database server.

We already had some keep alive system implemented, but when an attempt to reconnect failed the first time the db_connect function would log_error and the eval would stop.

Reviewed: ​http://reviewboard.infoarena.ro/r/96/

File:

• trunk/common/db/db_mysql.php (modified) (3 diffs)

trunk/common/db/db_mysql.php

@@ -8 +8 @@
     log_assert(!isset($dbLink), "Already connected to the database.");
 
-    // log_print("connecting to database");
+    // log_print("Connecting to database...");
     if (!$dbLink = @mysql_connect(IA_DB_HOST, IA_DB_USER, IA_DB_PASS)) {
-        log_error('Cannot connect to database: '.mysql_error());
+        if (IA_DB_KEEP_ALIVE) {
+            $timeout = 0;
+            do {
+                log_warn('Cannot connect to database: '.mysql_error().
+                    "\nRetrying...");
+
+                // Wait for an increasing amount of seconds to avoid
+                // strain on the mysql server if it is under heavy load
+                sleep($timeout);
+                $timeout = min(max(1, $timeout * 2), 60);
+
+                // Try and reconnect to the database server
+                $dbLink = @mysql_connect(IA_DB_HOST, IA_DB_USER, IA_DB_PASS);
+            } while (!db_isalive());
+            log_print('Connected to database.');
+        } else {
+            log_error('Cannot connect to database: '.mysql_error());
+        }
     }
     if (!mysql_select_db(IA_DB_NAME, $dbLink)) {
@@ -16 +33 @@
     }
     mysql_query('SET NAMES utf8');
+    return true;
 }
 
@@ -35 +53 @@
         return false;
     }
-    while (!db_isalive()) {
-        if (is_resource($dbLink)) {
-            mysql_close($dbLink);
-        }
-        $dbLink = null;
-        db_connect();
-        // Wait for 1 second
-        sleep(1);
+    if (is_resource($dbLink)) {
+        mysql_close($dbLink);
     }
-    return true;
+
+    return db_connect();
 }