X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCronJobs.php;h=385109ae20cdd3b5fb36ddfdfc6e3d3872f1d15a;hb=977e4fe5d9895d88dd84f4dbc34aac299e409985;hp=164b1cf4d203747739b2e603073b134a906ba8e1;hpb=3a9db3f6373330902a5efe42eb8790c240fba580;p=friendica.git diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 164b1cf4d2..385109ae20 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -1,33 +1,45 @@ . + * */ + namespace Friendica\Worker; use Friendica\App; -use Friendica\BaseObject; -use Friendica\Core\Cache; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Database\PostUpdate; +use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\GContact; +use Friendica\Model\Nodeinfo; use Friendica\Model\Photo; use Friendica\Model\User; -use Friendica\Network\Probe; -use Friendica\Protocol\PortableContact; use Friendica\Util\Proxy as ProxyUtils; - -require_once 'include/dba.php'; -require_once 'mod/nodeinfo.php'; +use Friendica\Util\Strings; class CronJobs { public static function execute($command = '') { - $a = BaseObject::getApp(); + $a = DI::app(); // No parameter set? So return if ($command == '') { @@ -36,60 +48,55 @@ class CronJobs Logger::log("Starting cronjob " . $command, Logger::DEBUG); - // Call possible post update functions - // see src/Database/PostUpdate.php for more details - if ($command == 'post_update') { - PostUpdate::update(); - return; - } - - // update nodeinfo data - if ($command == 'nodeinfo') { - nodeinfo_cron(); - return; - } - - // Expire and remove user entries - if ($command == 'expire_and_remove_users') { - self::expireAndRemoveUsers(); - return; - } - - if ($command == 'update_contact_birthdays') { - Contact::updateBirthdays(); - return; - } - - if ($command == 'update_photo_albums') { - self::updatePhotoAlbums(); - return; - } - - // Clear cache entries - if ($command == 'clear_cache') { - self::clearCache($a); - return; + switch($command) { + case 'post_update': + PostUpdate::update(); + break; + + case 'nodeinfo': + Logger::info('cron_start'); + Nodeinfo::update(); + // Now trying to register + $url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname(); + Logger::debug('Check registering url', ['url' => $url]); + $ret = DI::httpRequest()->fetch($url); + Logger::debug('Check registering answer', ['answer' => $ret]); + Logger::info('cron_end'); + break; + + case 'expire_and_remove_users': + self::expireAndRemoveUsers(); + break; + + case 'update_contact_birthdays': + Contact::updateBirthdays(); + break; + + case 'update_photo_albums': + self::updatePhotoAlbums(); + break; + + case 'clear_cache': + self::clearCache($a); + break; + + case 'repair_database': + self::repairDatabase(); + break; + + case 'move_storage': + self::moveStorage(); + break; + + default: + Logger::log("Cronjob " . $command . " is unknown.", Logger::DEBUG); } - // Repair missing Diaspora values in contacts - if ($command == 'repair_diaspora') { - self::repairDiaspora($a); - return; - } - - // Repair entries in the database - if ($command == 'repair_database') { - self::repairDatabase(); - return; - } - - Logger::log("Xronjob " . $command . " is unknown.", Logger::DEBUG); - return; } /** - * @brief Update the cached values for the number of photo albums per user + * Update the cached values for the number of photo albums per user */ private static function updatePhotoAlbums() { @@ -104,7 +111,7 @@ class CronJobs } /** - * @brief Expire and remove user entries + * Expire and remove user entries */ private static function expireAndRemoveUsers() { @@ -117,6 +124,7 @@ class CronJobs while ($user = DBA::fetch($users)) { User::remove($user['uid']); } + DBA::close($users); // delete user records for recently removed accounts $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() "]); @@ -129,16 +137,18 @@ class CronJobs DBA::delete('user', ['uid' => $user['uid']]); } + DBA::close($users); } /** - * @brief Clear cache entries + * Clear cache entries * * @param App $a + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function clearCache(App $a) { - $last = Config::get('system', 'cache_last_cleared'); + $last = DI::config()->get('system', 'cache_last_cleared'); if ($last) { $next = $last + (3600); // Once per hour @@ -152,7 +162,7 @@ class CronJobs } // clear old cache - Cache::clear(); + DI::cache()->clear(); // clear old item cache files clear_cache(); @@ -164,17 +174,17 @@ class CronJobs clear_cache($a->getBasePath() . "/view/smarty3/compiled", $a->getBasePath() . "/view/smarty3/compiled"); // clear cache for image proxy - if (!Config::get("system", "proxy_disabled")) { + if (!DI::config()->get("system", "proxy_disabled")) { clear_cache($a->getBasePath(), $a->getBasePath() . "/proxy"); - $cachetime = Config::get('system', 'proxy_cache_time'); + $cachetime = DI::config()->get('system', 'proxy_cache_time'); if (!$cachetime) { $cachetime = ProxyUtils::DEFAULT_TIME; } $condition = ['`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime]; - DBA::delete('photo', $condition); + Photo::delete($condition); } // Delete the cached OEmbed entries that are older than three month @@ -183,91 +193,25 @@ class CronJobs // Delete the cached "parse_url" entries that are older than three month DBA::delete('parsed_url', ["`created` < NOW() - INTERVAL 3 MONTH"]); - // Maximum table size in megabyte - $max_tablesize = intval(Config::get('system', 'optimize_max_tablesize')) * 1000000; - if ($max_tablesize == 0) { - $max_tablesize = 100 * 1000000; // Default are 100 MB - } - if ($max_tablesize > 0) { - // Minimum fragmentation level in percent - $fragmentation_level = intval(Config::get('system', 'optimize_fragmentation')) / 100; - if ($fragmentation_level == 0) { - $fragmentation_level = 0.3; // Default value is 30% - } - - // Optimize some tables that need to be optimized - $r = q("SHOW TABLE STATUS"); - foreach ($r as $table) { - - // Don't optimize tables that are too large - if ($table["Data_length"] > $max_tablesize) { - continue; - } - - // Don't optimize empty tables - if ($table["Data_length"] == 0) { - continue; - } - - // Calculate fragmentation - $fragmentation = $table["Data_free"] / ($table["Data_length"] + $table["Index_length"]); - - Logger::log("Table " . $table["Name"] . " - Fragmentation level: " . round($fragmentation * 100, 2), Logger::DEBUG); - - // Don't optimize tables that needn't to be optimized - if ($fragmentation < $fragmentation_level) { - continue; - } - - // So optimize it - Logger::log("Optimize Table " . $table["Name"], Logger::DEBUG); - q("OPTIMIZE TABLE `%s`", DBA::escape($table["Name"])); - } + if (DI::config()->get('system', 'optimize_tables')) { + Logger::info('Optimize start'); + DBA::e("OPTIMIZE TABLE `auth_codes`"); + DBA::e("OPTIMIZE TABLE `cache`"); + DBA::e("OPTIMIZE TABLE `challenge`"); + DBA::e("OPTIMIZE TABLE `locks`"); + DBA::e("OPTIMIZE TABLE `oembed`"); + DBA::e("OPTIMIZE TABLE `parsed_url`"); + DBA::e("OPTIMIZE TABLE `profile_check`"); + DBA::e("OPTIMIZE TABLE `session`"); + DBA::e("OPTIMIZE TABLE `tokens`"); + Logger::info('Optimize finished'); } - Config::set('system', 'cache_last_cleared', time()); + DI::config()->set('system', 'cache_last_cleared', time()); } /** - * @brief Repair missing values in Diaspora contacts - * - * @param App $a - */ - private static function repairDiaspora(App $a) - { - $starttime = time(); - - $r = q("SELECT `id`, `url` FROM `contact` - WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '') - ORDER BY RAND() LIMIT 50", DBA::escape(Protocol::DIASPORA)); - if (!DBA::isResult($r)) { - return; - } - - foreach ($r as $contact) { - // Quit the loop after 3 minutes - if (time() > ($starttime + 180)) { - return; - } - - if (!PortableContact::reachable($contact["url"])) { - continue; - } - - $data = Probe::uri($contact["url"]); - if ($data["network"] != Protocol::DIASPORA) { - continue; - } - - Logger::log("Repair contact " . $contact["id"] . " " . $contact["url"], Logger::DEBUG); - q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d", - DBA::escape($data["batch"]), DBA::escape($data["notify"]), DBA::escape($data["poll"]), DBA::escape($data["pubkey"]), - intval($contact["id"])); - } - } - - /** - * @brief Do some repairs in database entries + * Do some repairs in database entries * */ private static function repairDatabase() @@ -285,18 +229,38 @@ class CronJobs // There was an issue where the nick vanishes from the contact table q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''"); - // Update the global contacts for local users - $r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`"); - if (DBA::isResult($r)) { - foreach ($r AS $user) { - GContact::updateForUser($user["uid"]); - } - } - /// @todo /// - remove thread entries without item /// - remove sign entries without item /// - remove children when parent got lost /// - set contact-id in item when not present + + // Add intro entries for pending contacts + // We don't do this for DFRN entries since such revived contact requests seem to mostly fail. + $pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact` + WHERE `pending` AND `rel` IN (?, ?) AND `network` != ? + AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", + 0, Contact::FOLLOWER, Protocol::DFRN); + while ($contact = DBA::fetch($pending_contacts)) { + DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false, + 'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]); + } + DBA::close($pending_contacts); + } + + /** + * Moves up to 5000 attachments and photos to the current storage system. + * Self-replicates if legacy items have been found and moved. + * + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + private static function moveStorage() + { + $current = DI::storage(); + $moved = DI::storageManager()->move($current); + + if ($moved) { + Worker::add(PRIORITY_LOW, "CronJobs", "move_storage"); + } } }