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 a9f70aa40d3c6ce402eefd587e56718a453587d8..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);
@@ -64,6 +67,8 @@ class dba {
                        if(! $install)
                                system_unavailable();
                }
+
+               $a->save_timestamp($stamp1, "network");
        }
 
        public function getdb() {
@@ -78,18 +83,21 @@ class dba {
 
                $this->error = '';
 
-               if(x($a->config,'system') && x($a->config['system'],'db_log'))
-                       $stamp1 = microtime(true);
+               $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')) {
-                       $stamp2 = microtime(true);
-                       $duration = round($stamp2-$stamp1, 3);
                        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".
@@ -162,6 +170,7 @@ class dba {
                        }
                }
 
+               //$a->save_timestamp($stamp1, "database");
 
                if($this->debug)
                        logger('dba: ' . printable(print_r($r, true)));