Changeset 230

Timestamp:

Jan 17, 2007 10:10:38 PM (17 years ago)

Author:

quinn

Message:

Q - added better DB error correction and dying with _fail() method.

File:

• trunk/lib/DB.inc.php (modified) (3 diffs)

trunk/lib/DB.inc.php

@@ -141 +141 @@
             }
 
-            // Die or continue without connection?
-            if ($this->getParam('db_die_on_failure')) {
-                echo "\n\n<!-- Script execution stopped out of embarrassment. There was a database error. -->";
-                die;
-            } else {
-                return false;
-            }
+            // Die if db_die_on_failure = true, or just continue without connection
+            return $this->_fail();
         }
 
@@ -178 +173 @@
         return mysql_close($this->dbh);
     }
+    
+    /*
+    * Die only if db_die_on_failure is true. This will be set to false for some cases
+    * when a database is not required for web app functionality.
+    *
+    * @access   public
+    * @param    string  $msg Print $msg when dying.
+    * @return   bool    false If we don't die.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    15 Jan 2007 15:59:00
+    */
+    function _fail()
+    {
+        if ($this->getParam('db_die_on_failure')) {
+            echo _("This page is temporarily unavailable. Please try again in a few minutes.");
+            die;
+        } else {
+            return false;
+        }
+    }
 
     /**
@@ -254 +270 @@
         // Error checking.
         if (!$qid || mysql_error($this->dbh)) {
+            $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
             if ($this->getParam('db_debug')) {
                 echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
-            } else {
-                echo _("This page is temporarily unavailable. It should be back up in a few minutes.");
-            }
-            $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
-            if ($this->getParam('db_die_on_failure')) {
-                echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
-                die;
-            }
+            }            
+            // Die if db_die_on_failure = true, or just continue without connection
+            return $this->_fail();
         }