From: Hypolite Petovan Date: Wed, 4 Mar 2020 20:59:19 +0000 (-0500) Subject: Switch all item deletion logging to info level X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f047944b2d28adb2239d68c81f1281d6ccffba8b;p=friendica.git Switch all item deletion logging to info level --- diff --git a/src/Database/Database.php b/src/Database/Database.php index 50b45d675f..f86f279965 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -1262,7 +1262,7 @@ class Database if ((count($command['conditions']) > 1) || is_int($first_key)) { $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 ($do_transaction) { @@ -1292,7 +1292,7 @@ class Database $sql = "DELETE FROM " . DBA::quoteIdentifier($table) . " WHERE " . DBA::quoteIdentifier($field) . " IN (" . 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 ($do_transaction) { diff --git a/src/Model/Item.php b/src/Model/Item.php index df5fc1976e..063a338742 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1116,7 +1116,7 @@ class Item */ 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 $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin', 'deleted', 'file', 'resource-id', 'event-id', 'attach', @@ -1124,12 +1124,12 @@ class Item 'icid', 'iaid', 'psid']; $item = self::selectFirst($fields, ['id' => $item_id]); if (!DBA::isResult($item)) { - Logger::debug('Item not found.', ['id' => $item_id]); + Logger::info('Item not found.', ['id' => $item_id]); return false; } 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; } @@ -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; } @@ -1938,7 +1938,7 @@ class Item if ($entries > 1) { // 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. DBA::delete('item', ['id' => $current_post]); @@ -2721,7 +2721,7 @@ class Item if (!$mention) { if (($community_page || $prvgroup) && !$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]); return true; } diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php index 19d95b6752..0316b9ebf6 100644 --- a/src/Worker/DBClean.php +++ b/src/Worker/DBClean.php @@ -107,7 +107,7 @@ class DBClean { Logger::log("found global item orphans: ".$count); while ($orphan = DBA::fetch($r)) { $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"]]); } Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id); @@ -130,7 +130,7 @@ class DBClean { Logger::log("found item orphans without parents: ".$count); while ($orphan = DBA::fetch($r)) { $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"]]); } Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id); @@ -328,7 +328,7 @@ class DBClean { Logger::log("found global item entries from expired threads: ".$count); while ($orphan = DBA::fetch($r)) { $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"]]); } Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id); diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php index bccb439e50..f98d56ed0c 100644 --- a/src/Worker/Expire.php +++ b/src/Worker/Expire.php @@ -45,7 +45,7 @@ class Expire $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"]; $rows = DBA::select('item', ['id', 'guid'], $condition); 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::close($rows); diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php index cfec2c1846..28a32160a0 100644 --- a/src/Worker/RemoveContact.php +++ b/src/Worker/RemoveContact.php @@ -43,7 +43,7 @@ class RemoveContact { do { $items = Item::select(['id', 'guid'], $condition, ['limit' => 100]); 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::close($items);