Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updating type-hints and some naming conventions

Browse source
This commit is contained in:
Philipp Holzer 2019-02-04 09:30:48 +01:00
parent 1c51d7d22f
commit d78ac57514
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
9 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/Database/DBA.php
View file

@ -34,7 +34,7 @@ class DBA
/**
* @var IConfigCache
*/
private static $config;
private static $configCache;
private static $server_info = '';
private static $connection;
private static $driver;
@ -50,14 +50,14 @@ class DBA
private static $db_name = '';
private static $db_charset = '';
public static function connect($config, $serveraddr, $user, $pass, $db, $charset = null)
public static function connect($configCache, $serveraddr, $user, $pass, $db, $charset = null)
{
if (!is_null(self::$connection) && self::connected()) {
return true;
}
// We are storing these values for being able to perform a reconnect
self::$config = $config;
self::$configCache = $configCache;
self::$db_serveraddr = $serveraddr;
self::$db_user = $user;
self::$db_pass = $pass;
@ -158,7 +158,7 @@ class DBA
public static function reconnect() {
self::disconnect();
$ret = self::connect(self::$config, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
$ret = self::connect(self::$configCache, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
return $ret;
}
@ -213,7 +213,7 @@ class DBA
*/
private static function logIndex($query) {
if (!self::$config->get('system', 'db_log_index')) {
if (!self::$configCache->get('system', 'db_log_index')) {
return;
}
@ -232,18 +232,18 @@ class DBA
return;
}
$watchlist = explode(',', self::$config->get('system', 'db_log_index_watch'));
$blacklist = explode(',', self::$config->get('system', 'db_log_index_blacklist'));
$watchlist = explode(',', self::$configCache->get('system', 'db_log_index_watch'));
$blacklist = explode(',', self::$configCache->get('system', 'db_log_index_blacklist'));
while ($row = self::fetch($r)) {
if ((intval(self::$config->get('system', 'db_loglimit_index')) > 0)) {
if ((intval(self::$configCache->get('system', 'db_loglimit_index')) > 0)) {
$log = (in_array($row['key'], $watchlist) &&
($row['rows'] >= intval(self::$config->get('system', 'db_loglimit_index'))));
($row['rows'] >= intval(self::$configCache->get('system', 'db_loglimit_index'))));
} else {
$log = false;
}
if ((intval(self::$config->get('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval($Config::getConfigValue('system', 'db_loglimit_index_high')))) {
if ((intval(self::$configCache->get('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval(self::$configCache->get('system', 'db_loglimit_index_high')))) {
$log = true;
}
@ -253,7 +253,7 @@ class DBA
if ($log) {
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@file_put_contents(self::$config->get('system', 'db_log_index'), DateTimeFormat::utcNow()."\t".
@file_put_contents(self::$configCache->get('system', 'db_log_index'), DateTimeFormat::utcNow()."\t".
$row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
basename($backtrace[1]["file"])."\t".
$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
@ -423,7 +423,7 @@ class DBA
$orig_sql = $sql;
if (self::$config->get('system', 'db_callstack') !== null) {
if (self::$configCache->get('system', 'db_callstack') !== null) {
$sql = "/*".System::callstack()." */ ".$sql;
}
@ -584,15 +584,15 @@ class DBA
$a->saveTimestamp($stamp1, 'database');
if (self::$config->get('system', 'db_log')) {
if (self::$configCache->get('system', 'db_log')) {
$stamp2 = microtime(true);
$duration = (float)($stamp2 - $stamp1);
if (($duration > self::$config->get('system', 'db_loglimit'))) {
if (($duration > self::$configCache->get('system', 'db_loglimit'))) {
$duration = round($duration, 3);
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@file_put_contents(self::$config->get('system', 'db_log'), DateTimeFormat::utcNow()."\t".$duration."\t".
@file_put_contents(self::$configCache->get('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);
@ -1031,7 +1031,7 @@ class DBA
* This process must only be started once, since the value is cached.
*/
private static function buildRelationData() {
$definition = DBStructure::definition(self::$config->get('system', 'basepath'));
$definition = DBStructure::definition(self::$configCache->get('system', 'basepath'));
foreach ($definition AS $table => $structure) {
foreach ($structure['fields'] AS $field => $field_struct) {