tbrehm
2009-03-17 0e381b3d001c49d15fb8bf23af5f91fdda26e87b
Improved mysql error logging.
2 files modified
26 ■■■■■ changed files
server/lib/classes/db_mysql.inc.php 18 ●●●●● patch | view | raw | blame | history
server/server.php 8 ●●●● patch | view | raw | blame | history
server/lib/classes/db_mysql.inc.php
@@ -41,7 +41,7 @@
        var $errorNumber = 0;    // last error number
        var $errorMessage = "";    // last error message
        var $errorLocation = "";// last error location
        var $show_error_messages = false;
        var $show_error_messages = true;
        // constructor
        function db()
@@ -58,13 +58,15 @@
        // error handler
        function updateError($location)
        {
            global $app;
            $this->errorNumber = mysql_errno();
            $this->errorMessage = mysql_error();
            $this->errorLocation = $location;
            if($this->errorNumber && $this->show_error_messages)
            if($this->errorNumber && $this->show_error_messages && method_exists($app,'log'))
            {
                echo('<br /><b>'.$this->errorLocation.'</b><br />'.$this->errorMessage);
                flush();
                // echo('<br /><b>'.$this->errorLocation.'</b><br />'.$this->errorMessage);
                $app->log($this->errorLocation." ".$this->errorMessage,LOGLEVEL_WARN);
                //flush();
            }
        }
@@ -75,7 +77,7 @@
                $this->linkId = mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
                if(!$this->linkId)
                {
                    $this->updateError('DB::connect()<br />mysql_connect');
                    $this->updateError('DB::connect()-> mysql_connect');
                    return false;
                }
            }
@@ -90,11 +92,11 @@
            }
            if(!mysql_select_db($this->dbName, $this->linkId))
            {
                $this->updateError('DB::connect()<br />mysql_select_db');
                $this->updateError('DB::connect()-> mysql_select_db');
                return false;
            }
            $this->queryId = @mysql_query($queryString, $this->linkId);
            $this->updateError('DB::query('.$queryString.')<br />mysql_query');
            $this->updateError('DB::query('.$queryString.') -> mysql_query');
            if(!$this->queryId)
            {
                return false;
@@ -132,7 +134,7 @@
        function nextRecord()
        {
            $this->record = mysql_fetch_assoc($this->queryId);
            $this->updateError('DB::nextRecord()<br />mysql_fetch_array');
            $this->updateError('DB::nextRecord()-> mysql_fetch_array');
            if(!$this->record || !is_array($this->record))
            {
                return false;
server/server.php
@@ -68,7 +68,7 @@
$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
if($app->dbmaster->connect()) {
if($app->db->connect() && $app->dbmaster->connect()) {
    // get the dalaog_id of the last performed record
    $server_db_record = $app->dbmaster->queryOneRecord("SELECT updated, config FROM server WHERE server_id = ".$conf["server_id"]);
@@ -114,7 +114,11 @@
        $app->plugins->loadPlugins('core');
    }
} else {
    $app->log("Unable to connect to master server.",LOGLEVEL_WARN);
    if(!$app->db->connect()) {
        $app->log("Unable to connect to local server.".$app->db->errorMessage,LOGLEVEL_WARN);
    } else {
        $app->log("Unable to connect to master server.".$app->dbmaster->errorMessage,LOGLEVEL_WARN);
    }
}
// Remove lock