X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=dae14559312d00ebb1b8bf8a358ccecd40380e5f;hb=4b0e370c4c2ec606833aa326fba49922a7c470ab;hp=b89cf53766feb474d64f2288930f014164b69b98;hpb=034038849cfa710f8b65bc5ab0121cc4865b8b28;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index b89cf53766..dae1455931 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/datetime.php');
+
 /**
  *
  * MySQL database class
@@ -18,19 +20,28 @@ class dba {
 	private $db;
 	public  $mysqli = true;
 	public  $connected = false;
-
+	public  $error = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
+		global $a;
+
+		$stamp1 = microtime(true);
 
 		$server = trim($server);
 		$user = trim($user);
 		$pass = trim($pass);
 		$db = trim($db);
 
+		if (!(strlen($server) && strlen($user))){
+			$this->connected = false;
+			$this->db = null;
+			return;
+		}
+
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-					notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server));
+					$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
 					$this->connected = false;
 					$this->db = null;
 					return;
@@ -56,6 +67,8 @@ class dba {
 			if(! $install)
 				system_unavailable();
 		}
+
+		$a->save_timestamp($stamp1, "network");
 	}
 
 	public function getdb() {
@@ -63,25 +76,50 @@ class dba {
 	}
 
 	public function q($sql) {
-		
+		global $a;
+
 		if((! $this->db) || (! $this->connected))
 			return false;
-		
+
+		$this->error = '';
+
+		$stamp1 = microtime(true);
+
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
 			$result = @mysql_query($sql,$this->db);
 
-		if($this->debug) {
+		$stamp2 = microtime(true);
+		$duration = (float)($stamp2-$stamp1);
 
-			$mesg = '';
+		$a->save_timestamp($stamp1, "database");
 
-			if($this->mysqli) {
-				if($this->db->errno)
-					logger('dba: ' . $this->db->error);
+		if(x($a->config,'system') && x($a->config['system'],'db_log')) {
+			if (($duration > $a->config["system"]["db_loglimit"])) {
+				$duration = round($duration, 3);
+				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+				@file_put_contents($a->config["system"]["db_log"], $duration."\t".
+						basename($backtrace[1]["file"])."\t".
+						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
+						substr($sql, 0, 2000)."\n", FILE_APPEND);
 			}
-			elseif(mysql_errno($this->db))
-				logger('dba: ' . mysql_error($this->db));
+		}
+
+		if($this->mysqli) {
+			if($this->db->errno)
+				$this->error = $this->db->error;
+		}
+		elseif(mysql_errno($this->db))
+				$this->error = mysql_error($this->db);
+
+		if(strlen($this->error)) {
+			logger('dba: ' . $this->error);
+		}
+
+		if($this->debug) {
+
+			$mesg = '';
 
 			if($result === false)
 				$mesg = 'false';
@@ -93,24 +131,24 @@ class dba {
     			else
 					$mesg = mysql_num_rows($result) . ' results' . EOL;
 			}
-    
-			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
+
+			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
+				. (($this->error) ? ' error: ' . $this->error : '')
+				. EOL;
 
 			logger('dba: ' . $str );
 		}
-		else {
 
-			/**
-			 * If dbfail.out exists, we will write any failed calls directly to it,
-			 * regardless of any logging that may or may nor be in effect.
-			 * These usually indicate SQL syntax errors that need to be resolved.
-			 */
+		/**
+		 * If dbfail.out exists, we will write any failed calls directly to it,
+		 * regardless of any logging that may or may nor be in effect.
+		 * These usually indicate SQL syntax errors that need to be resolved.
+		 */
 
-			if($result === false) {
-				logger('dba: ' . printable($sql) . ' returned false.');
-				if(file_exists('dbfail.out'))
-					file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
-			}
+		if($result === false) {
+			logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
+			if(file_exists('dbfail.out'))
+				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
 		}
 
 		if(($result === true) || ($result === false))
@@ -119,7 +157,7 @@ class dba {
 		$r = array();
 		if($this->mysqli) {
 			if($result->num_rows) {
-				while($x = $result->fetch_array(MYSQL_ASSOC))
+				while($x = $result->fetch_array(MYSQLI_ASSOC))
 					$r[] = $x;
 				$result->free_result();
 			}
@@ -132,9 +170,10 @@ class dba {
 			}
 		}
 
-    
+		//$a->save_timestamp($stamp1, "database");
+
 		if($this->debug)
-			logger('dba: ' . printable(print_r($r, true)), LOGGER_DATA);
+			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
 	}
 
@@ -152,10 +191,11 @@ class dba {
 	}
 
 	function __destruct() {
-		if($this->mysqli)
-			@$this->db->close();
-		else
-			@mysql_close($this->db);
+		if ($this->db) 
+			if($this->mysqli)
+				$this->db->close();
+			else
+				mysql_close($this->db);
 	}
 }}
 
@@ -186,6 +226,7 @@ function dbesc($str) {
 }}
 
 
+
 // Function: q($sql,$args);
 // Description: execute SQL query with printf style args.
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
@@ -199,8 +240,11 @@ function q($sql) {
 	unset($args[0]);
 
 	if($db && $db->connected) {
-		$ret = $db->q(vsprintf($sql,$args));
-		return $ret;
+		$stmt = @vsprintf($sql,$args); // Disabled warnings
+		//logger("dba: q: $stmt", LOGGER_ALL);
+		if($stmt === false)
+			logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
+		return $db->q($stmt);
 	}
 
 	/**
@@ -209,7 +253,6 @@ function q($sql) {
 	 * session data after abnormal program termination 
 	 *
 	 */
-
 	logger('dba: no database: ' . print_r($args,true));
 	return false; 
 
@@ -251,6 +294,10 @@ function dbesc_array(&$arr) {
 	if(is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}		
+}}
+
 
+function dba_timer() {
+	return microtime(true);
+}