strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert using Config class in dba

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-08 01:45:22 -04:00
parent 47992d06ce
commit 9396b05659
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/dba.php
View file

@ -1,6 +1,9 @@
<?php
use Friendica\Core\Config;
// Do not use Core\Config in this class at risk of infinite loop.
// Please use App->getConfigVariable() instead.
//use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Database\DBStructure;
@ -383,7 +386,7 @@ class dba {
$orig_sql = $sql;
if (Config::get('system', 'db_callstack')) {
if ($a->getConfigValue('system', 'db_callstack')) {
$sql = "/*".System::callstack()." */ ".$sql;
}
@ -544,15 +547,15 @@ class dba {
$a->save_timestamp($stamp1, 'database');
if (Config::get('system', 'db_log')) {
if ($a->getConfigValue('system', 'db_log')) {
$stamp2 = microtime(true);
$duration = (float)($stamp2 - $stamp1);
if (($duration > Config::get('system', 'db_loglimit'))) {
if (($duration > $a->getConfigValue('system', 'db_loglimit'))) {
$duration = round($duration, 3);
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@file_put_contents(Config::get('system', 'db_log'), DateTimeFormat::utcNow()."\t".$duration."\t".
@file_put_contents($a->getConfigValue('system', 'db_log'), DateTimeFormat::utcNow()."\t".$duration."\t".
basename($backtrace[1]["file"])."\t".
$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND);