]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/CronJobs.php
Merge pull request #9017 from annando/issue-9015
[friendica.git] / src / Worker / CronJobs.php
index b66358b0e820d140e5a8bd057f891d6843bf9603..385109ae20cdd3b5fb36ddfdfc6e3d3872f1d15a 100644 (file)
@@ -29,13 +29,9 @@ 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;
 
@@ -63,7 +59,7 @@ class CronJobs
                                // Now trying to register
                                $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;
@@ -84,10 +80,6 @@ class CronJobs
                                self::clearCache($a);
                                break;
 
-                       case 'repair_diaspora':
-                               self::repairDiaspora($a);
-                               break;
-
                        case 'repair_database':
                                self::repairDatabase();
                                break;
@@ -132,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() "]);
@@ -144,6 +137,7 @@ class CronJobs
 
                        DBA::delete('user', ['uid' => $user['uid']]);
                }
+               DBA::close($users);
        }
 
        /**
@@ -199,91 +193,23 @@ 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(DI::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(DI::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');                      
                }
 
                DI::config()->set('system', 'cache_last_cleared', time());
        }
 
-       /**
-        * 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;
-               }
-
-               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"]));
-               }
-       }
-
        /**
         * Do some repairs in database entries
         *
@@ -303,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