aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-20 00:11:32 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-20 00:11:32 +0200
commit8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f (patch)
tree7068762df3646f652bffefa767fa8a7757f8468d /include
parent9a940786c18c1c2bd772aec93f1828f67dc45667 (diff)
downloadvolse-hubzilla-8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f.tar.gz
volse-hubzilla-8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f.tar.bz2
volse-hubzilla-8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f.zip
Performance tests
Diffstat (limited to 'include')
-rw-r--r--include/config.php2
-rw-r--r--include/dba.php20
2 files changed, 13 insertions, 9 deletions
diff --git a/include/config.php b/include/config.php
index 4cff38090..e416bec6e 100644
--- a/include/config.php
+++ b/include/config.php
@@ -6,7 +6,7 @@
* Note:
* Please do not store booleans - convert to 0/1 integer values
* The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.
+ * and this could lead to subtle bugs.
*
* There are a few places in the code (such as the admin panel) where boolean
* configurations need to be fixed as of 10/08/2011.
diff --git a/include/dba.php b/include/dba.php
index c9f880241..7ecce7270 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,27 @@ class dba {
}
public function q($sql) {
-
+
if((! $this->db) || (! $this->connected))
return false;
-
+
$this->error = '';
+ //@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+
if($this->mysqli)
$result = @$this->db->query($sql);
else
$result = @mysql_query($sql,$this->db);
+ //@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Stop '."\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 +111,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 +150,7 @@ class dba {
}
}
-
+
if($this->debug)
logger('dba: ' . printable(print_r($r, true)));
return($r);