bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Blocked servers can now be deleted

Browse source
This commit is contained in:
Michael 2023-03-18 19:41:41 +00:00
parent bbb5440144
commit a151cf450a
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Worker/UpdateBlockedServers.php
View file

@ -23,6 +23,7 @@ namespace Friendica\Worker;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\GServer; use Friendica\Model\GServer;
use Friendica\Util\Network; use Friendica\Util\Network;
@ -33,11 +34,14 @@ class UpdateBlockedServers
*/ */
public static function execute() public static function execute()
{ {
Logger::debug('Update blocked servers - start'); Logger::info('Update blocked servers - start');
$gservers = DBA::select('gserver', ['id', 'url', 'blocked']); $gservers = DBA::select('gserver', ['id', 'url', 'blocked']);
$changed = 0;
$unchanged = 0;
while ($gserver = DBA::fetch($gservers)) { while ($gserver = DBA::fetch($gservers)) {
$blocked = Network::isUrlBlocked($gserver['url']); $blocked = Network::isUrlBlocked($gserver['url']);
if (!is_null($gserver['blocked']) && ($blocked == $gserver['blocked'])) { if (!is_null($gserver['blocked']) && ($blocked == $gserver['blocked'])) {
$unchanged++;
continue; continue;
} }
@ -46,8 +50,15 @@ class UpdateBlockedServers
} else { } else {
GServer::setUnblockedById($gserver['id']); GServer::setUnblockedById($gserver['id']);
} }
$changed++;
} }
DBA::close($gservers); DBA::close($gservers);
Logger::debug('Update blocked servers - done'); Logger::info('Update blocked servers - done', ['changed' => $changed, 'unchanged' => $unchanged]);
if (DI::config()->get('system', 'delete-blocked-servers')) {
Logger::info('Delete blocked servers - start');
DBA::p("DELETE FROM `gserver` WHERE `blocked` AND NOT EXISTS(SELECT `gsid` FROM `inbox-status` WHERE `gsid` = `gserver`.`id`) AND NOT EXISTS(SELECT `gsid` FROM `contact` WHERE gsid= `gserver`.`id`) AND NOT EXISTS(SELECT `gsid` FROM `apcontact` WHERE `gsid` = `gserver`.`id`) AND NOT EXISTS(SELECT `gsid` FROM `delivery-queue` WHERE `gsid` = `gserver`.`id`) AND NOT EXISTS(SELECT `gsid` FROM `diaspora-contact` WHERE `gsid` = `gserver`.`id`) AND NOT EXISTS(SELECT `gserver-id` FROM `gserver-tag` WHERE `gserver-id` = `gserver`.`id`)");
Logger::info('Delete blocked servers - done', ['rows' => DBA::affectedRows()]);
}
} }
} }

6
static/defaults.config.php
View file

@ -237,6 +237,10 @@ return [
// Periodically delete waiting database processes. // Periodically delete waiting database processes.
'delete_sleeping_processes' => false, 'delete_sleeping_processes' => false,
// delete-blocked-servers (Boolean)
// Delete blocked servers if possible.
'delete-blocked-servers' => false,
// dice_profiler_threshold (Float) // dice_profiler_threshold (Float)
// For profiling Dice class creation (0 = disabled, >0 = seconds threshold for profiling) // For profiling Dice class creation (0 = disabled, >0 = seconds threshold for profiling)
'dice_profiler_threshold' => 0.5, 'dice_profiler_threshold' => 0.5,
@ -508,7 +512,7 @@ return [
'png_quality' => 8, 'png_quality' => 8,
// process_view (Boolean) // process_view (Boolean)
// Process the "View" activity that is used by Peertube. View activities are displayed, when "emoji_activities" are enabled. // Process the "View" activity that is used by Peertube. View activities are displayed, when "emoji_activities" are enabled.
'process_view' => false, 'process_view' => false,
// profiler (Boolean) // profiler (Boolean)