public $error = false;
function __construct($server,$user,$pass,$db,$install = false) {
+ global $a;
+
+ $stamp1 = microtime(true);
$server = trim($server);
$user = trim($user);
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)) {
if(! $install)
system_unavailable();
}
+
+ $a->save_timestamp($stamp1, "network");
}
public function getdb() {
}
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);
- if($this->debug) {
+ $stamp2 = microtime(true);
+ $duration = (float)($stamp2-$stamp1);
- $mesg = '';
+ $a->save_timestamp($stamp1, "database");
-<<<<<<< HEAD:include/dba.php
- // If dbfail.out exists, we will write any failed calls directly to it,
- // regardless of any logging that may or may nor be in effect.
- // These usually indicate SQL syntax errors that need to be resolved.
- if(file_exists('dbfail.out')) {
- file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
- }
- logger('dba: ' . $str );
- if(FALSE===$result) {
- $this->throwOrLog(new RuntimeException('dba: ' . $str));
- return;
- }
-=======
- if($this->mysqli) {
- if($this->db->errno)
- logger('dba: ' . $this->db->error);
->>>>>>> upstream/master:include/dba.php
+ 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);
}
- elseif(mysql_errno($this->db))
- logger('dba: ' . mysql_error($this->db));
+ }
+
+ 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($result === false)
$mesg = 'false';
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 );
}
*/
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))
$result->free_result();
}
}
-<<<<<<< HEAD:include/dba.php
-
- /**
- * starts a transaction. Transactions need to be finished with
- * commit() or rollback(). Please mind that the db table engine may
- * not support this.
- */
- public function beginTransaction() {
- if($this->mysqli) {
- return $this->db->autocommit(false);
- } else {
- //no transaction support in mysql module...
- mysql_query('SET AUTOCOMMIT = 0;', $db);
- }
- }
-
- /**
- * rollback a transaction. So, rollback anything that was done since the last call
- * to beginTransaction().
- */
- public function rollback() {
- if($this->mysqli) {
- return $this->db->rollback();
- } else {
- //no transaction support in mysql module...
- mysql_query('ROLLBACK;', $db);
- }
- $this->stopTransaction();
- }
-
- /**
- * commit a transaction. So, write any query to the database.
- */
- public function commit() {
- if($this->mysqli) {
- return $this->db->commit();
- } else {
- //no transaction support in mysql module...
- mysql_query('COMMIT;', $db);
- }
- $this->stopTransaction();
- }
-
- private function stopTransaction() {
- if($this->mysqli) {
- return $this->db->autocommit(true);
- } else {
- //no transaction support in mysql module...
- mysql_query('SET AUTOCOMMIT = 1;', $db);
- }
- }
-
- public function dbg($dbg) {
- $this->debug = $dbg;
- }
-=======
else {
if(mysql_num_rows($result)) {
while($x = mysql_fetch_array($result, MYSQL_ASSOC))
}
}
-
+ //$a->save_timestamp($stamp1, "database");
+
if($this->debug)
logger('dba: ' . printable(print_r($r, true)));
return($r);
}
->>>>>>> upstream/master:include/dba.php
public function dbg($dbg) {
$this->debug = $dbg;
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);
}
if(is_array($arr) && count($arr)) {
array_walk($arr,'dbesc_array_cb');
}
-}}
+}}
+
+function dba_timer() {
+ return microtime(true);
+}
projects / friendica.git / blobdiff