get rid of 'Friendika'

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 44a663eac4dd313e7bfd1b151bf99f6856b22dd0..8d224b570f44299c431f087392cc5e735787ef27 100644 (file)
--- 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,26 +71,48 @@ 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);
+
+               if(strlen($this->error)) {
+                       logger('dba: ' . $this->error);
+               }
+
                if($this->debug) {
 
                        $mesg = '';
 
-                       if($this->mysqli) {
-                               if($this->db->errno)
-                                       logger('dba: ' . $this->db->error);
-                       }
-                       elseif(mysql_errno($this->db))
-                               logger('dba: ' . mysql_error($this->db));
-
                        if($result === false)
                                $mesg = 'false';
                        elseif($result === true)
@@ -101,8 +123,10 @@ 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 );
                }
@@ -114,9 +138,9 @@ 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", FILE_APPEND);
+                               file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
                }
 
                if(($result === true) || ($result === false))
@@ -138,7 +162,7 @@ class dba {
                        }
                }
 
-    
+
                if($this->debug)
                        logger('dba: ' . printable(print_r($r, true)));
                return($r);
@@ -261,3 +285,9 @@ function dbesc_array(&$arr) {
                array_walk($arr,'dbesc_array_cb');
        }
 }}
+
+
+function dba_timer() {
+       return microtime(true);
+}
+