From 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 21 Aug 2013 10:28:20 -0400
Subject: [PATCH] Merged revisions 4069-4117 from stable branch.
---
server/lib/classes/db_mysql.inc.php | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 005bd1a..23ba8a6 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -45,6 +45,7 @@
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
public $show_error_messages = false; // false in server, true in interface
+ private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
// constructor
public function __construct($host = NULL , $user = NULL, $pass = NULL, $database = NULL) {
@@ -59,11 +60,22 @@
$this->dbClientFlags = $conf['db_client_flags'];
parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
- if ($this->connect_error) {
+ $try = 0;
+ //while(!is_null($this->connect_error) && $try < 10) {
+ while(mysqli_connect_error() && $try < 10) {
+ if($try > 8) sleep(5);
+ elseif($try > 0) sleep(1);
+
+ $try++;
$this->updateError('DB::__construct');
- } else {
- $this->setCharacterEncoding();
+
+ parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName);
}
+
+ //if(is_null($this->connect_error)) $this->isConnected = true;
+ if(!mysqli_connect_error()) $this->isConnected = true;
+
+ $this->setCharacterEncoding();
}
public function __destruct() {
@@ -79,12 +91,21 @@
public function updateError($location) {
global $app;
- if($this->connect_error) {
+ /*
+ if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
} else {
$this->errorNumber = $this->errno;
$this->errorMessage = $this->error;
+ }
+ */
+ if(mysqli_connect_error()) {
+ $this->errorNumber = mysqli_connect_errno();
+ $this->errorMessage = mysqli_connect_error();
+ } else {
+ $this->errorNumber = mysqli_errno($this);
+ $this->errorMessage = mysqli_error($this);
}
$this->errorLocation = $location;
@@ -103,22 +124,24 @@
}
private function setCharacterEncoding() {
+ if($this->isConnected == false) return false;
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) {
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
- $ok = parent::ping();
+ $ok = $this->ping();
if(!$ok) {
- if(!parent::real_connect($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName)) {
+ if(!$this->real_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbName)) {
if($try > 9) {
$this->updateError('DB::query -> reconnect');
return false;
} else {
- sleep(1);
+ sleep(($try > 7 ? 5 : 1));
}
} else {
$this->setCharacterEncoding();
@@ -350,6 +373,15 @@
return true;
}
+
+ //** Deletes a record and saves the changes into the datalog
+ public function datalogError($errormsg) {
+ global $app;
+
+ if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) $this->query("UPDATE sys_datalog set error = '".$this->quote($errormsg)."' WHERE datalog_id = ".$app->modules->current_datalog_id);
+
+ return true;
+ }
public function freeResult($query)
@@ -468,7 +500,7 @@
// gibt Array mit Tabellennamen zur�ck
public function getTables($database_name = '') {
-
+ if($this->isConnected == false) return false;
if($database_name == '') $database_name = $this->dbName;
$result = parent::query("SHOW TABLES FROM $database_name");
for ($i = 0; $i < $result->num_rows; $i++) {
--
Gitblit v1.9.1