rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DB::$logfile can be used to log all queries to either a resource or a file

Browse Source 
DB::debugMode() is now a shorthand for "DB::$logfile = STDOUT"
This commit is contained in:
Sergey Tsalkov
2021-06-23 03:05:22 +00:00
parent 50fd6ed6d2
commit dc21f646af
1 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
db.class.php
View File

@@ -33,10 +33,11 @@ class DB {
public static $nested_transactions = false;
public static $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public static $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
public static $logfile;
// internal
protected static $mdb = null;
public static $variables_to_sync = array('param_char', 'named_param_seperator', 'nested_transactions', 'ssl', 'connect_options');
public static $variables_to_sync = array('param_char', 'named_param_seperator', 'nested_transactions', 'ssl', 'connect_options', 'logfile');
public static function getMDB() {
$mdb = DB::$mdb;
@@ -59,6 +60,11 @@ class DB {
return call_user_func_array($fn, $args);
}
static function debugMode($enable=true) {
if ($enable) self::$logfile = STDOUT;
else self::$logfile = null;
}
}
@@ -78,6 +84,7 @@ class MeekroDB {
public $nested_transactions = false;
public $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
public $logfile;
// internal
public $internal_mysql = null;
@@ -267,28 +274,43 @@ class MeekroDB {
}
}
function debugMode($enable = true) {
$fn = function($args) {
$results[] = sprintf('QUERY: %s [%s ms]', $args['query'], $args['runtime']);
protected function defaultRunHook($args) {
if (! $this->logfile) return;
$query = $args['query'];
$query = preg_replace('/\s+/', ' ', $query);
$query = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $query);
$results[] = sprintf('QUERY: %s', $query);
$results[] = sprintf('RUNTIME: %s ms', $args['runtime']);
if (isset($args['affected']) && $args['affected']) {
$results[] = sprintf('AFFECTED ROWS: %s', $args['affected']);
}
if (isset($args['rows']) && $args['rows']) {
$results[] = sprintf('RETURNED ROWS: %s', $args['rows']);
}
if (isset($args['error'])) {
$results[] = 'ERROR: ' . $args['error'];
}
if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
echo implode("\n", $results) . "\n";
$is_console = (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']));
if (!$is_console && $this->logfile === STDOUT) {
$results = implode("<br>\n", $results) . "<br>\n";
} else {
echo implode("<br>\n", $results) . "<br>\n";
$results = implode("\n", $results) . "\n\n";
}
};
if ($enable && !isset($this->debug_mode_hook)) {
$this->debug_mode_hook = $this->addHook('post_run', $fn);
if (is_resource($this->logfile)) {
fwrite($this->logfile, $results);
} else {
file_put_contents($this->logfile, $results, FILE_APPEND);
}
else if (!$enable && isset($this->debug_mode_hook)) {
$this->removeHook('post_run', $this->debug_mode_hook);
unset($this->debug_mode_hook);
}
function debugMode($enable=true) {
if ($enable) $this->logfile = STDOUT;
else $this->logfile = null;
}
public function serverVersion() { $this->get(); return $this->server_info; }
@@ -808,30 +830,24 @@ class MeekroDB {
$Exception = new MeekroDBException($db->error, $sql, $db->errno);
}
$this->runHook('post_run', array(
'query' => $sql,
'runtime' => $runtime,
'affected' => $db->affected_rows,
'exception' => $Exception,
'error' => $Exception ? $Exception->getMessage() : null,
));
$hookHash = array('query' => $sql, 'runtime' => $runtime);
if ($Exception) {
$result = $this->runHook('run_failed', array(
'query' => $sql,
'runtime' => $runtime,
'exception' => $Exception,
'error' => $Exception->getMessage(),
));
$hookHash['exception'] = $Exception;
$hookHash['error'] = $Exception->getMessage();
} else if ($this->num_rows) {
$hookHash['rows'] = $this->num_rows;
} else {
$hookHash['affected'] = $db->affected_rows;
}
$this->defaultRunHook($hookHash);
$this->runHook('post_run', $hookHash);
if ($Exception) {
$result = $this->runHook('run_failed', $hookHash);
if ($result !== false) throw $Exception;
}
else {
$this->runHook('run_success', array(
'query' => $sql,
'runtime' => $runtime,
'affected' => $db->affected_rows,
));
$this->runHook('run_success', $hookHash);
}
if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) return $result;