oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log function

Browse source 
implement log() function.
This commit is contained in:
Adam Magness 2018-10-29 17:20:46 -04:00
parent d6d593d724
commit 14fde5dc9b
122 changed files with 1280 additions and 1161 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Database/DBA.php
View file

@ -6,6 +6,7 @@ namespace Friendica\Database;
// Please use App->getConfigVariable() instead.
//use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Util\DateTimeFormat;
use mysqli;
@ -412,7 +413,7 @@ class DBA
if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
// Question: Should we continue or stop the query here?
logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
Logger::log('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
}
$sql = self::cleanQuery($sql);
@ -552,7 +553,7 @@ class DBA
$error = self::$error;
$errorno = self::$errorno;
logger('DB Error '.self::$errorno.': '.self::$error."\n".
Logger::log('DB Error '.self::$errorno.': '.self::$error."\n".
System::callstack(8)."\n".self::replaceParameters($sql, $args));
// On a lost connection we try to reconnect - but only once.
@ -560,14 +561,14 @@ class DBA
if (self::$in_retrial || !self::reconnect()) {
// It doesn't make sense to continue when the database connection was lost
if (self::$in_retrial) {
logger('Giving up retrial because of database error '.$errorno.': '.$error);
Logger::log('Giving up retrial because of database error '.$errorno.': '.$error);
} else {
logger("Couldn't reconnect after database error ".$errorno.': '.$error);
Logger::log("Couldn't reconnect after database error ".$errorno.': '.$error);
}
exit(1);
} else {
// We try it again
logger('Reconnected after database error '.$errorno.': '.$error);
Logger::log('Reconnected after database error '.$errorno.': '.$error);
self::$in_retrial = true;
$ret = self::p($sql, $args);
self::$in_retrial = false;
@ -636,13 +637,13 @@ class DBA
$error = self::$error;
$errorno = self::$errorno;
logger('DB Error '.self::$errorno.': '.self::$error."\n".
Logger::log('DB Error '.self::$errorno.': '.self::$error."\n".
System::callstack(8)."\n".self::replaceParameters($sql, $params));
// On a lost connection we simply quit.
// A reconnect like in self::p could be dangerous with modifications
if ($errorno == 2006) {
logger('Giving up because of database error '.$errorno.': '.$error);
Logger::log('Giving up because of database error '.$errorno.': '.$error);
exit(1);
}
@ -835,7 +836,7 @@ class DBA
public static function insert($table, $param, $on_duplicate_update = false) {
if (empty($table) || empty($param)) {
logger('Table and fields have to be set');
Logger::log('Table and fields have to be set');
return false;
}
@ -1051,7 +1052,7 @@ class DBA
public static function delete($table, array $conditions, array $options = [], $in_process = false, array &$callstack = [])
{
if (empty($table) || empty($conditions)) {
logger('Table and conditions have to be set');
Logger::log('Table and conditions have to be set');
return false;
}
@ -1142,7 +1143,7 @@ class DBA
if ((count($command['conditions']) > 1) || is_int($first_key)) {
$sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
logger(self::replaceParameters($sql, $conditions), LOGGER_DATA);
Logger::log(self::replaceParameters($sql, $conditions), LOGGER_DATA);
if (!self::e($sql, $conditions)) {
if ($do_transaction) {
@ -1172,7 +1173,7 @@ class DBA
$sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
logger(self::replaceParameters($sql, $field_values), LOGGER_DATA);
Logger::log(self::replaceParameters($sql, $field_values), LOGGER_DATA);
if (!self::e($sql, $field_values)) {
if ($do_transaction) {
@ -1223,7 +1224,7 @@ class DBA
public static function update($table, $fields, $condition, $old_fields = []) {
if (empty($table) || empty($fields) || empty($condition)) {
logger('Table, fields and condition have to be set');
Logger::log('Table, fields and condition have to be set');
return false;
}

9
src/Database/DBStructure.php
View file

@ -8,6 +8,7 @@ use Exception;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Util\DateTimeFormat;
require_once 'boot.php';
@ -69,7 +70,7 @@ class DBStructure
// No valid result?
if (!DBA::isResult($adminlist)) {
logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_INFO);
Logger::log(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_INFO);
// Don't continue
return;
@ -100,7 +101,7 @@ class DBStructure
}
//try the logger
logger("CRITICAL: Database structure update failed: ".$error_message);
Logger::log("CRITICAL: Database structure update failed: ".$error_message);
}
@ -221,7 +222,7 @@ class DBStructure
$errors = '';
logger('updating structure', LOGGER_DEBUG);
Logger::log('updating structure', LOGGER_DEBUG);
// Get the current structure
$database = [];
@ -234,7 +235,7 @@ class DBStructure
foreach ($tables AS $table) {
$table = current($table);
logger(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
Logger::log(sprintf('updating structure for table %s ...', $table), LOGGER_DEBUG);
$database[$table] = self::tableStructure($table);
}
}

39
src/Database/PostUpdate.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Database;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Model\Contact;
use Friendica\Model\Item;
@ -52,7 +53,7 @@ class PostUpdate
return true;
}
logger("Start", LOGGER_DEBUG);
Logger::log("Start", LOGGER_DEBUG);
$end_id = Config::get("system", "post_update_1194_end");
if (!$end_id) {
@ -63,7 +64,7 @@ class PostUpdate
}
}
logger("End ID: ".$end_id, LOGGER_DEBUG);
Logger::log("End ID: ".$end_id, LOGGER_DEBUG);
$start_id = Config::get("system", "post_update_1194_start");
@ -82,14 +83,14 @@ class PostUpdate
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
if (!$r) {
Config::set("system", "post_update_version", 1194);
logger("Update is done", LOGGER_DEBUG);
Logger::log("Update is done", LOGGER_DEBUG);
return true;
} else {
Config::set("system", "post_update_1194_start", $r[0]["id"]);
$start_id = Config::get("system", "post_update_1194_start");
}
logger("Start ID: ".$start_id, LOGGER_DEBUG);
Logger::log("Start ID: ".$start_id, LOGGER_DEBUG);
$r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1000,1",
intval($start_id), intval($end_id),
@ -99,13 +100,13 @@ class PostUpdate
} else {
$pos_id = $end_id;
}
logger("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
Logger::log("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, LOGGER_DEBUG);
q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
intval($start_id), intval($pos_id),
DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
logger("Done", LOGGER_DEBUG);
Logger::log("Done", LOGGER_DEBUG);
}
/**
@ -122,7 +123,7 @@ class PostUpdate
return true;
}
logger("Start", LOGGER_DEBUG);
Logger::log("Start", LOGGER_DEBUG);
$r = q("SELECT `contact`.`id`, `contact`.`last-item`,
(SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date`
FROM `user`
@ -138,7 +139,7 @@ class PostUpdate
}
Config::set("system", "post_update_version", 1206);
logger("Done", LOGGER_DEBUG);
Logger::log("Done", LOGGER_DEBUG);
return true;
}
@ -156,7 +157,7 @@ class PostUpdate
$id = Config::get("system", "post_update_version_1279_id", 0);
logger("Start from item " . $id, LOGGER_DEBUG);
Logger::log("Start from item " . $id, LOGGER_DEBUG);
$fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
@ -170,7 +171,7 @@ class PostUpdate
$items = Item::select($fields, $condition, $params);
if (DBA::errorNo() != 0) {
logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
return false;
}
@ -225,7 +226,7 @@ class PostUpdate
Config::set("system", "post_update_version_1279_id", $id);
logger("Processed rows: " . $rows . " - last processed item: " . $id, LOGGER_DEBUG);
Logger::log("Processed rows: " . $rows . " - last processed item: " . $id, LOGGER_DEBUG);
if ($start_id == $id) {
// Set all deprecated fields to "null" if they contain an empty string
@ -237,13 +238,13 @@ class PostUpdate
foreach ($nullfields as $field) {
$fields = [$field => null];
$condition = [$field => ''];
logger("Setting '" . $field . "' to null if empty.", LOGGER_DEBUG);
Logger::log("Setting '" . $field . "' to null if empty.", LOGGER_DEBUG);
// Important: This has to be a "DBA::update", not a "Item::update"
DBA::update('item', $fields, $condition);
}
Config::set("system", "post_update_version", 1279);
logger("Done", LOGGER_DEBUG);
Logger::log("Done", LOGGER_DEBUG);
return true;
}
@ -306,7 +307,7 @@ class PostUpdate
$id = Config::get("system", "post_update_version_1281_id", 0);
logger("Start from item " . $id, LOGGER_DEBUG);
Logger::log("Start from item " . $id, LOGGER_DEBUG);
$fields = ['id', 'guid', 'uri', 'uri-id', 'parent-uri', 'parent-uri-id', 'thr-parent', 'thr-parent-id'];
@ -317,7 +318,7 @@ class PostUpdate
$items = DBA::select('item', $fields, $condition, $params);
if (DBA::errorNo() != 0) {
logger('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage());
return false;
}
@ -358,17 +359,17 @@ class PostUpdate
Config::set("system", "post_update_version_1281_id", $id);
logger("Processed rows: " . $rows . " - last processed item: " . $id, LOGGER_DEBUG);
Logger::log("Processed rows: " . $rows . " - last processed item: " . $id, LOGGER_DEBUG);
if ($start_id == $id) {
logger("Updating item-uri in item-activity", LOGGER_DEBUG);
Logger::log("Updating item-uri in item-activity", LOGGER_DEBUG);
DBA::e("UPDATE `item-activity` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-activity`.`uri` SET `item-activity`.`uri-id` = `item-uri`.`id` WHERE `item-activity`.`uri-id` IS NULL");
logger("Updating item-uri in item-content", LOGGER_DEBUG);
Logger::log("Updating item-uri in item-content", LOGGER_DEBUG);
DBA::e("UPDATE `item-content` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-content`.`uri` SET `item-content`.`uri-id` = `item-uri`.`id` WHERE `item-content`.`uri-id` IS NULL");
Config::set("system", "post_update_version", 1281);
logger("Done", LOGGER_DEBUG);
Logger::log("Done", LOGGER_DEBUG);
return true;
}