friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Performance tests

Browse source
This commit is contained in:
Michael Vogel 2012-05-20 00:11:32 +02:00
parent 9a940786c1
commit 8c80fe0bf5
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config.php
View file

@ -6,7 +6,7 @@
* Note: * Note:
* Please do not store booleans - convert to 0/1 integer values * Please do not store booleans - convert to 0/1 integer values
* The get_?config() functions return boolean false for keys that are unset, * 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 * 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. * configurations need to be fixed as of 10/08/2011.

20
include/dba.php
View file

@ -32,9 +32,9 @@ class dba {
if (!(strlen($server) && strlen($user))){ if (!(strlen($server) && strlen($user))){
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
return; return;
} }
if($install) { if($install) {
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@ -71,23 +71,27 @@ class dba {
} }
public function q($sql) { public function q($sql) {
if((! $this->db) || (! $this->connected)) if((! $this->db) || (! $this->connected))
return false; return false;
$this->error = ''; $this->error = '';
//@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
if($this->mysqli) if($this->mysqli)
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
else else
$result = @mysql_query($sql,$this->db); $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->mysqli) {
if($this->db->errno) if($this->db->errno)
$this->error = $this->db->error; $this->error = $this->db->error;
} }
elseif(mysql_errno($this->db)) elseif(mysql_errno($this->db))
$this->error = mysql_error($this->db); $this->error = mysql_error($this->db);
if(strlen($this->error)) { if(strlen($this->error)) {
logger('dba: ' . $this->error); logger('dba: ' . $this->error);
@ -107,8 +111,8 @@ class dba {
else else
$mesg = mysql_num_rows($result) . ' results' . EOL; $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 : '') . (($this->error) ? ' error: ' . $this->error : '')
. EOL; . EOL;
@ -146,7 +150,7 @@ class dba {
} }
} }
if($this->debug) if($this->debug)
logger('dba: ' . printable(print_r($r, true))); logger('dba: ' . printable(print_r($r, true)));
return($r); return($r);

2
mod/network.php
View file

@ -413,7 +413,7 @@ function network_content(&$a, $update = 0) {
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl);
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ", $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
dbesc(protect_sprintf('%s' . $myurl)), dbesc(protect_sprintf('%' . $myurl)),
dbesc(protect_sprintf('%' . $myurl . '\\]%')), dbesc(protect_sprintf('%' . $myurl . '\\]%')),
dbesc(protect_sprintf('%' . $diasp_url . '\\]%')) dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
); );

5
view/theme/diabook/theme.php
View file

@ -18,6 +18,11 @@ $a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_
//init css on network and profilepages //init css on network and profilepages
$cssFile = null; $cssFile = null;
// Preload config
load_config("diabook");
load_pconfig(local_user(), "diabook");
//get statuses of boxes at right-hand-column //get statuses of boxes at right-hand-column
$close_pages = false; $close_pages = false;
$site_close_pages = get_config("diabook", "close_pages" ); $site_close_pages = get_config("diabook", "close_pages" );