X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=ad33705bf14bfa1ac45741d48fe3223a96e9fd7e;hb=74caf1a4a745643312ab4ee2bf28d7e82c9e1350;hp=414f4ae7a7edf3d2e8eb65929346e5bb7be9042e;hpb=e3fecb2557ad0ac2f156f9583683f7c9d998e212;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index 414f4ae7a7..ad33705bf1 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -32,9 +32,9 @@ class dba {
 		if (!(strlen($server) && strlen($user))){
 			$this->connected = false;
 			$this->db = null;
-			return;			
+			return;
 		}
-		
+
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@@ -71,23 +71,39 @@ class dba {
 	}
 
 	public function q($sql) {
-		
+		global $a;
+
 		if((! $this->db) || (! $this->connected))
 			return false;
 
 		$this->error = '';
-		
+
+		if(x($a->config,'system') && x($a->config['system'],'db_log'))
+			$stamp1 = microtime(true);
+
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
 			$result = @mysql_query($sql,$this->db);
 
+		if(x($a->config,'system') && x($a->config['system'],'db_log')) {
+			$stamp2 = microtime(true);
+			$duration = round($stamp2-$stamp1, 3);
+			if ($duration > $a->config["system"]["db_loglimit"]) {
+				$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);
+			}
+		}
+
 		if($this->mysqli) {
 			if($this->db->errno)
 				$this->error = $this->db->error;
 		}
 		elseif(mysql_errno($this->db))
-				$this->error = mysql_error($this->db);	
+				$this->error = mysql_error($this->db);
 
 		if(strlen($this->error)) {
 			logger('dba: ' . $this->error);
@@ -107,8 +123,8 @@ class dba {
     			else
 					$mesg = mysql_num_rows($result) . ' results' . EOL;
 			}
-    
-			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg 
+
+			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
 				. (($this->error) ? ' error: ' . $this->error : '')
 				. EOL;
 
@@ -122,7 +138,7 @@ class dba {
 		 */
 
 		if($result === false) {
-			logger('dba: ' . printable($sql) . ' returned 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);
 		}
@@ -146,7 +162,7 @@ class dba {
 			}
 		}
 
-    
+
 		if($this->debug)
 			logger('dba: ' . printable(print_r($r, true)));
 		return($r);
@@ -215,9 +231,10 @@ function q($sql) {
 	unset($args[0]);
 
 	if($db && $db->connected) {
-		$stmt = vsprintf($sql,$args);
+		$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('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
 		return $db->q($stmt);
 	}
 
@@ -269,3 +286,9 @@ function dbesc_array(&$arr) {
 		array_walk($arr,'dbesc_array_cb');
 	}
 }}
+
+
+function dba_timer() {
+	return microtime(true);
+}
+