version 2021.03-dev

[friendica.git] / src / Worker / Expire.php

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 908eea3ac9cccc350d69f3ff162bcb5f22c5bdcb..7c304a5b249227f5bcb11a3e4313107993128e02 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -1,7 +1,22 @@
 <?php
 /**
- * @file src/Worker/Expire.php
- * Expires old item entries
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Worker;
@@ -13,6 +28,9 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
 
+/**
+ * Expires old item entries
+ */
 class Expire
 {
        public static function execute($param = '', $hook_function = '')
@@ -25,19 +43,15 @@ class Expire
                        Logger::log('Delete expired items', Logger::DEBUG);
                        // physically remove anything that has been deleted for more than two months
                        $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"];
-                       $rows = DBA::select('item', ['id'],  $condition);
+                       $rows = DBA::select('item', ['id', 'guid'],  $condition);
                        while ($row = DBA::fetch($rows)) {
+                               Logger::info('Delete expired item', ['id' => $row['id'], 'guid' => $row['guid']]);
                                DBA::delete('item', ['id' => $row['id']]);
                        }
                        DBA::close($rows);
 
                        // Normally we shouldn't have orphaned data at all.
                        // If we do have some, then we have to check why.
-                       Logger::log('Deleting orphaned item activities - start', Logger::DEBUG);
-                       $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
-                       DBA::delete('item-activity', $condition);
-                       Logger::log('Orphaned item activities deleted: ' . DBA::affectedRows(), Logger::DEBUG);
-
                        Logger::log('Deleting orphaned item content - start', Logger::DEBUG);
                        $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
                        DBA::delete('item-content', $condition);