clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch all item deletion logging to info level

This commit is contained in:
Hypolite Petovan 2020-03-04 15:59:19 -05:00
parent b4597a643d
commit f047944b2d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Database/Database.php
View File

@ -1262,7 +1262,7 @@ class Database
if ((count($command['conditions']) > 1) || is_int($first_key)) { if ((count($command['conditions']) > 1) || is_int($first_key)) {
$sql = "DELETE FROM " . DBA::quoteIdentifier($command['table']) . " " . $condition_string; $sql = "DELETE FROM " . DBA::quoteIdentifier($command['table']) . " " . $condition_string;
$this->logger->debug($this->replaceParameters($sql, $conditions), ['callstack' => System::callstack(6), 'internal_callstack' => $callstack]); $this->logger->info($this->replaceParameters($sql, $conditions), ['callstack' => System::callstack(6), 'internal_callstack' => $callstack]);
if (!$this->e($sql, $conditions)) { if (!$this->e($sql, $conditions)) {
if ($do_transaction) { if ($do_transaction) {
@ -1292,7 +1292,7 @@ class Database
$sql = "DELETE FROM " . DBA::quoteIdentifier($table) . " WHERE " . DBA::quoteIdentifier($field) . " IN (" . $sql = "DELETE FROM " . DBA::quoteIdentifier($table) . " WHERE " . DBA::quoteIdentifier($field) . " IN (" .
substr(str_repeat("?, ", count($field_values)), 0, -2) . ");"; substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
$this->logger->debug($this->replaceParameters($sql, $field_values), ['callstack' => System::callstack(6), 'internal_callstack' => $callstack]); $this->logger->info($this->replaceParameters($sql, $field_values), ['callstack' => System::callstack(6), 'internal_callstack' => $callstack]);
if (!$this->e($sql, $field_values)) { if (!$this->e($sql, $field_values)) {
if ($do_transaction) { if ($do_transaction) {

12
src/Model/Item.php
View File

@ -1116,7 +1116,7 @@ class Item
*/ */
public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH) public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH)
{ {
Logger::notice('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]); Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
// locate item to be deleted // locate item to be deleted
$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin', $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
'deleted', 'file', 'resource-id', 'event-id', 'attach', 'deleted', 'file', 'resource-id', 'event-id', 'attach',
@ -1124,12 +1124,12 @@ class Item
'icid', 'iaid', 'psid']; 'icid', 'iaid', 'psid'];
$item = self::selectFirst($fields, ['id' => $item_id]); $item = self::selectFirst($fields, ['id' => $item_id]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
Logger::debug('Item not found.', ['id' => $item_id]); Logger::info('Item not found.', ['id' => $item_id]);
return false; return false;
} }
if ($item['deleted']) { if ($item['deleted']) {
Logger::debug('Item has already been marked for deletion.', ['id' => $item_id]); Logger::info('Item has already been marked for deletion.', ['id' => $item_id]);
return false; return false;
} }
@ -1238,7 +1238,7 @@ class Item
} }
} }
Logger::debug('Item has been marked for deletion.', ['id' => $item_id]); Logger::info('Item has been marked for deletion.', ['id' => $item_id]);
return true; return true;
} }
@ -1938,7 +1938,7 @@ class Item
if ($entries > 1) { if ($entries > 1) {
// There are duplicates. We delete our just created entry. // There are duplicates. We delete our just created entry.
Logger::notice('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]); Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]);
// Yes, we could do a rollback here - but we are having many users with MyISAM. // Yes, we could do a rollback here - but we are having many users with MyISAM.
DBA::delete('item', ['id' => $current_post]); DBA::delete('item', ['id' => $current_post]);
@ -2721,7 +2721,7 @@ class Item
if (!$mention) { if (!$mention) {
if (($community_page || $prvgroup) && if (($community_page || $prvgroup) &&
!$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) { !$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) {
Logger::notice('Delete private group/communiy top-level item without mention', ['id' => $item_id, 'guid'=> $item['guid']]); Logger::info('Delete private group/communiy top-level item without mention', ['id' => $item_id, 'guid'=> $item['guid']]);
DBA::delete('item', ['id' => $item_id]); DBA::delete('item', ['id' => $item_id]);
return true; return true;
} }

6
src/Worker/DBClean.php
View File

@ -107,7 +107,7 @@ class DBClean {
Logger::log("found global item orphans: ".$count); Logger::log("found global item orphans: ".$count);
while ($orphan = DBA::fetch($r)) { while ($orphan = DBA::fetch($r)) {
$last_id = $orphan["id"]; $last_id = $orphan["id"];
Logger::notice('Delete global orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]); Logger::info('Delete global orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
DBA::delete('item', ['id' => $orphan["id"]]); DBA::delete('item', ['id' => $orphan["id"]]);
} }
Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id); Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id);
@ -130,7 +130,7 @@ class DBClean {
Logger::log("found item orphans without parents: ".$count); Logger::log("found item orphans without parents: ".$count);
while ($orphan = DBA::fetch($r)) { while ($orphan = DBA::fetch($r)) {
$last_id = $orphan["id"]; $last_id = $orphan["id"];
Logger::notice('Delete orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]); Logger::info('Delete orphan item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
DBA::delete('item', ['id' => $orphan["id"]]); DBA::delete('item', ['id' => $orphan["id"]]);
} }
Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id); Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id);
@ -328,7 +328,7 @@ class DBClean {
Logger::log("found global item entries from expired threads: ".$count); Logger::log("found global item entries from expired threads: ".$count);
while ($orphan = DBA::fetch($r)) { while ($orphan = DBA::fetch($r)) {
$last_id = $orphan["id"]; $last_id = $orphan["id"];
Logger::notice('Delete expired thread item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]); Logger::info('Delete expired thread item', ['id' => $orphan['id'], 'guid' => $orphan['guid']]);
DBA::delete('item', ['id' => $orphan["id"]]); DBA::delete('item', ['id' => $orphan["id"]]);
} }
Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id); Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id);

2
src/Worker/Expire.php
View File

@ -45,7 +45,7 @@ class Expire
$condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"]; $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"];
$rows = DBA::select('item', ['id', 'guid'], $condition); $rows = DBA::select('item', ['id', 'guid'], $condition);
while ($row = DBA::fetch($rows)) { while ($row = DBA::fetch($rows)) {
Logger::notice('Delete expired item', ['id' => $row['id'], 'guid' => $row['guid']]); Logger::info('Delete expired item', ['id' => $row['id'], 'guid' => $row['guid']]);
DBA::delete('item', ['id' => $row['id']]); DBA::delete('item', ['id' => $row['id']]);
} }
DBA::close($rows); DBA::close($rows);

2
src/Worker/RemoveContact.php
View File

@ -43,7 +43,7 @@ class RemoveContact {
do { do {
$items = Item::select(['id', 'guid'], $condition, ['limit' => 100]); $items = Item::select(['id', 'guid'], $condition, ['limit' => 100]);
while ($item = Item::fetch($items)) { while ($item = Item::fetch($items)) {
Logger::notice('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]); Logger::info('Delete removed contact item', ['id' => $item['id'], 'guid' => $item['guid']]);
DBA::delete('item', ['id' => $item['id']]); DBA::delete('item', ['id' => $item['id']]);
} }
DBA::close($items); DBA::close($items);