From 1ba20c7fa0f520917cad04448220a18d73d8d3ae Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 15 Jan 2013 04:47:46 -0500
Subject: [PATCH] Fixed: possible problem and memory leak on connection errors - included a maximum loop count of 10 on connection errors - added check of mysqli ping() result
---
interface/lib/classes/db_mysql.inc.php | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 1506e5a..02ad8d3 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -61,10 +61,9 @@
if ($this->connect_error) {
$this->updateError('DB::__construct');
return false;
+ } else {
+ $this->setCharacterEncoding();
}
- parent::query( 'SET NAMES '.$this->dbCharset);
- parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
-
}
public function __destruct() {
@@ -89,14 +88,37 @@
// This right here will allow us to use the samefile for server & interface
if($this->show_error_messages) {
echo $error_msg;
- } else if(method_exists($app, 'log')) {
+ } else if(is_object($app) && method_exists($app, 'log')) {
$app->log($error_msg, LOGLEVEL_WARN);
}
}
}
+
+ private function setCharacterEncoding() {
+ parent::query( 'SET NAMES '.$this->dbCharset);
+ parent::query( "SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'");
+ }
public function query($queryString) {
- $this->queryId = parent::query($queryString);
+ $try = 0;
+ do {
+ $try++;
+ $ok = parent::ping();
+ if(!$ok) {
+ if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+ if($try > 9) {
+ $this->updateError('DB::query -> reconnect');
+ return false;
+ } else {
+ sleep(1);
+ }
+ } else {
+ $this->setCharacterEncoding();
+ $ok = true;
+ }
+ }
+ } while($ok == false);
+ $this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
if($this->errorNumber) debug_print_backtrace();
if(!$this->queryId) {
@@ -183,10 +205,10 @@
if(is_array($record_old) && count($record_old) > 0) {
foreach($record_old as $key => $val) {
// if(!isset($record_new[$key]) || $record_new[$key] != $val) {
- if($record_new[$key] != $val) {
+ if(@$record_new[$key] != $val) {
// Record has changed
$diffrec_full['old'][$key] = $val;
- $diffrec_full['new'][$key] = $record_new[$key];
+ $diffrec_full['new'][$key] = @$record_new[$key];
$diff_num++;
} else {
$diffrec_full['old'][$key] = $val;
--
Gitblit v1.9.1