X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FCronJobs.php;h=385109ae20cdd3b5fb36ddfdfc6e3d3872f1d15a;hb=977e4fe5d9895d88dd84f4dbc34aac299e409985;hp=311ec59a53c2d2787c830f479cb30d2d2c6e8319;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 311ec59a53..385109ae20 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -1,27 +1,37 @@ . + * */ + 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\StorageManager; 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\GServer; use Friendica\Model\Nodeinfo; use Friendica\Model\Photo; use Friendica\Model\User; -use Friendica\Network\Probe; -use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; @@ -29,7 +39,7 @@ class CronJobs { public static function execute($command = '') { - $a = BaseObject::getApp(); + $a = DI::app(); // No parameter set? So return if ($command == '') { @@ -47,9 +57,9 @@ class CronJobs Logger::info('cron_start'); Nodeinfo::update(); // Now trying to register - $url = 'http://the-federation.info/register/' . $a->getHostName(); + $url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname(); Logger::debug('Check registering url', ['url' => $url]); - $ret = Network::fetchUrl($url); + $ret = DI::httpRequest()->fetch($url); Logger::debug('Check registering answer', ['answer' => $ret]); Logger::info('cron_end'); break; @@ -70,10 +80,6 @@ class CronJobs self::clearCache($a); break; - case 'repair_diaspora': - self::repairDiaspora($a); - break; - case 'repair_database': self::repairDatabase(); break; @@ -90,7 +96,7 @@ class CronJobs } /** - * @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() { @@ -105,7 +111,7 @@ class CronJobs } /** - * @brief Expire and remove user entries + * Expire and remove user entries */ private static function expireAndRemoveUsers() { @@ -118,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() "]); @@ -130,17 +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 @@ -154,7 +162,7 @@ class CronJobs } // clear old cache - Cache::clear(); + DI::cache()->clear(); // clear old item cache files clear_cache(); @@ -166,10 +174,10 @@ 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; @@ -185,93 +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"])); - } - } - - Config::set('system', 'cache_last_cleared', time()); - } - - /** - * @brief Repair missing values in Diaspora contacts - * - * @param App $a - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - * @throws \ImagickException - */ - 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; + 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'); } - foreach ($r as $contact) { - // Quit the loop after 3 minutes - if (time() > ($starttime + 180)) { - return; - } - - if (!GServer::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"])); - } + DI::config()->set('system', 'cache_last_cleared', time()); } /** - * @brief Do some repairs in database entries + * Do some repairs in database entries * */ private static function repairDatabase() @@ -289,14 +229,6 @@ 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 @@ -324,8 +256,8 @@ class CronJobs */ private static function moveStorage() { - $current = StorageManager::getBackend(); - $moved = StorageManager::move($current); + $current = DI::storage(); + $moved = DI::storageManager()->move($current); if ($moved) { Worker::add(PRIORITY_LOW, "CronJobs", "move_storage");