Better handling of the network field in the item table.

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index c9f880241ba9003d38cc2a356c90e62daeb7fc59..dae14559312d00ebb1b8bf8a358ccecd40380e5f 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -23,6 +23,9 @@ class dba {
        public  $error = false;
 
        function __construct($server,$user,$pass,$db,$install = false) {
+               global $a;
+
+               $stamp1 = microtime(true);
 
                $server = trim($server);
                $user = trim($user);
@@ -32,9 +35,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)) {
@@ -64,6 +67,8 @@ class dba {
                        if(! $install)
                                system_unavailable();
                }
+
+               $a->save_timestamp($stamp1, "network");
        }
 
        public function getdb() {
@@ -71,23 +76,42 @@ 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);
 
+               $stamp2 = microtime(true);
+               $duration = (float)($stamp2-$stamp1);
+
+               $a->save_timestamp($stamp1, "database");
+
+               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);
+                       }
+               }
+
                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 +131,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;
 
@@ -146,7 +170,8 @@ class dba {
                        }
                }
 
-    
+               //$a->save_timestamp($stamp1, "database");
+
                if($this->debug)
                        logger('dba: ' . printable(print_r($r, true)));
                return($r);
@@ -215,9 +240,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 +295,9 @@ function dbesc_array(&$arr) {
                array_walk($arr,'dbesc_array_cb');
        }
 }}
+
+
+function dba_timer() {
+       return microtime(true);
+}
+