diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index c1ba01d383..8d3bfc7435 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -149,6 +149,8 @@ class Site extends BaseAdmin $decoupled_receiver = (!empty($_POST['decoupled_receiver']) ? intval(trim($_POST['decoupled_receiver'])) : false); $cron_interval = (!empty($_POST['cron_interval']) ? intval($_POST['cron_interval']) : 0); $worker_defer_limit = (!empty($_POST['worker_defer_limit']) ? intval($_POST['worker_defer_limit']) : 15); + $worker_fetch_limit = (!empty($_POST['worker_fetch_limit']) ? intval($_POST['worker_fetch_limit']) : 1); + $relay_directly = !empty($_POST['relay_directly']); $relay_scope = (!empty($_POST['relay_scope']) ? trim($_POST['relay_scope']) : ''); @@ -319,7 +321,8 @@ class Site extends BaseAdmin $transactionConfig->set('system', 'decoupled_receiver' , $decoupled_receiver); $transactionConfig->set('system', 'cron_interval' , $cron_interval); $transactionConfig->set('system', 'worker_defer_limit' , $worker_defer_limit); - + $transactionConfig->set('system', 'worker_fetch_limit' , $worker_fetch_limit); + $transactionConfig->set('system', 'relay_directly' , $relay_directly); $transactionConfig->set('system', 'relay_scope' , $relay_scope); $transactionConfig->set('system', 'relay_server_tags' , $relay_server_tags); @@ -568,6 +571,7 @@ class Site extends BaseAdmin '$decoupled_receiver' => ['decoupled_receiver', DI::l10n()->t('Decoupled receiver'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Decouple incoming ActivityPub posts by processing them in the background via a worker process. Only enable this on fast systems.')], '$cron_interval' => ['cron_interval', DI::l10n()->t('Cron interval'), DI::config()->get('system', 'decoupled_receiver'), DI::l10n()->t('Minimal period in minutes between two calls of the "Cron" worker job.')], '$worker_defer_limit' => ['worker_defer_limit', DI::l10n()->t('Worker defer limit'), DI::config()->get('system', 'worker_defer_limit'), DI::l10n()->t('Per default the systems tries delivering for 15 times before dropping it.')], + '$worker_fetch_limit' => ['worker_fetch_limit', DI::l10n()->t('Worker fetch limit'), DI::config()->get('system', 'worker_fetch_limit'), DI::l10n()->t('Number of worker tasks that are fetched in a single query. Higher values should increase the performance, too high values will mostly likely decrease it. Only change it, when you know how to measure the performance of your system.')], '$relay_directly' => ['relay_directly', DI::l10n()->t('Direct relay transfer'), DI::config()->get('system', 'relay_directly'), DI::l10n()->t('Enables the direct transfer to other servers without using the relay servers')], '$relay_scope' => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), [Relay::SCOPE_NONE => DI::l10n()->t('Disabled'), Relay::SCOPE_ALL => DI::l10n()->t('all'), Relay::SCOPE_TAGS => DI::l10n()->t('tags')]], diff --git a/static/defaults.config.php b/static/defaults.config.php index 210bcbef64..2e3e7f3e64 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -608,10 +608,6 @@ return [ // If enabled, it prints out the number of running processes split by priority. 'worker_debug' => false, - // worker_fetch_limit (Integer) - // Number of worker tasks that are fetched in a single query. - 'worker_fetch_limit' => 1, - // worker_fork (Boolean) // Experimental setting. Use pcntl_fork to spawn a new worker process. // Does not work when "worker_multiple_fetch" is enabled (Needs more testing) diff --git a/static/settings.config.php b/static/settings.config.php index 3c577bf2b7..3c4672f8ac 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -269,6 +269,10 @@ return [ // Per default the systems tries delivering for 15 times before dropping it. 'worker_defer_limit' => 15, + // worker_fetch_limit (Integer) + // Number of worker tasks that are fetched in a single query. + 'worker_fetch_limit' => 1, + // worker_load_cooldown (Integer) // Maximum load that causes a cooldown before each worker function call. 'worker_load_cooldown' => 0, diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index b05dfe9761..b112644b48 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-03 14:30+0000\n" +"POT-Creation-Date: 2023-12-03 22:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2371,7 +2371,7 @@ msgstr "" msgid "All" msgstr "" -#: src/Content/Widget.php:591 src/Module/Admin/Site.php:461 +#: src/Content/Widget.php:591 src/Module/Admin/Site.php:464 #: src/Module/BaseSettings.php:125 src/Module/Settings/Channels.php:158 #: src/Module/Settings/Display.php:315 msgid "Channels" @@ -3937,7 +3937,7 @@ msgstr "" #: src/Module/Admin/Addons/Details.php:111 src/Module/Admin/Addons/Index.php:67 #: src/Module/Admin/Federation.php:214 src/Module/Admin/Logs/Settings.php:85 #: src/Module/Admin/Logs/View.php:83 src/Module/Admin/Queue.php:72 -#: src/Module/Admin/Site.php:444 src/Module/Admin/Storage.php:138 +#: src/Module/Admin/Site.php:447 src/Module/Admin/Storage.php:138 #: src/Module/Admin/Summary.php:196 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77 #: src/Module/Moderation/Users/Create.php:61 @@ -3975,7 +3975,7 @@ msgid "Addon %s failed to install." msgstr "" #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:86 -#: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:447 +#: src/Module/Admin/Logs/Settings.php:87 src/Module/Admin/Site.php:450 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:86 #: src/Module/Settings/Account.php:541 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Connectors.php:160 @@ -4175,8 +4175,8 @@ msgid "Enable Debugging" msgstr "" #: src/Module/Admin/Logs/Settings.php:91 src/Module/Admin/Logs/Settings.php:92 -#: src/Module/Admin/Logs/Settings.php:93 src/Module/Admin/Site.php:467 -#: src/Module/Admin/Site.php:475 +#: src/Module/Admin/Logs/Settings.php:93 src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:478 msgid "Read-only because it is set by an environment variable" msgstr "" @@ -4336,269 +4336,269 @@ msgstr "" msgid "Priority" msgstr "" -#: src/Module/Admin/Site.php:237 +#: src/Module/Admin/Site.php:239 #, php-format msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:359 src/Module/Settings/Display.php:215 +#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:215 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:376 src/Module/Settings/Display.php:225 +#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:225 #, php-format msgid "%s - (Experimental)" msgstr "" -#: src/Module/Admin/Site.php:388 +#: src/Module/Admin/Site.php:391 msgid "No community page" msgstr "" -#: src/Module/Admin/Site.php:389 +#: src/Module/Admin/Site.php:392 msgid "No community page for visitors" msgstr "" -#: src/Module/Admin/Site.php:390 +#: src/Module/Admin/Site.php:393 msgid "Public postings from users of this site" msgstr "" -#: src/Module/Admin/Site.php:391 +#: src/Module/Admin/Site.php:394 msgid "Public postings from the federated network" msgstr "" -#: src/Module/Admin/Site.php:392 +#: src/Module/Admin/Site.php:395 msgid "Public postings from local users and the federated network" msgstr "" -#: src/Module/Admin/Site.php:398 +#: src/Module/Admin/Site.php:401 msgid "Multi user instance" msgstr "" -#: src/Module/Admin/Site.php:421 +#: src/Module/Admin/Site.php:424 msgid "Closed" msgstr "" -#: src/Module/Admin/Site.php:422 +#: src/Module/Admin/Site.php:425 msgid "Requires approval" msgstr "" -#: src/Module/Admin/Site.php:423 +#: src/Module/Admin/Site.php:426 msgid "Open" msgstr "" -#: src/Module/Admin/Site.php:427 +#: src/Module/Admin/Site.php:430 msgid "Don't check" msgstr "" -#: src/Module/Admin/Site.php:428 +#: src/Module/Admin/Site.php:431 msgid "check the stable version" msgstr "" -#: src/Module/Admin/Site.php:429 +#: src/Module/Admin/Site.php:432 msgid "check the development version" msgstr "" -#: src/Module/Admin/Site.php:433 +#: src/Module/Admin/Site.php:436 msgid "none" msgstr "" -#: src/Module/Admin/Site.php:434 +#: src/Module/Admin/Site.php:437 msgid "Local contacts" msgstr "" -#: src/Module/Admin/Site.php:435 +#: src/Module/Admin/Site.php:438 msgid "Interactors" msgstr "" -#: src/Module/Admin/Site.php:445 src/Module/BaseAdmin.php:90 +#: src/Module/Admin/Site.php:448 src/Module/BaseAdmin.php:90 msgid "Site" msgstr "" -#: src/Module/Admin/Site.php:446 +#: src/Module/Admin/Site.php:449 msgid "General Information" msgstr "" -#: src/Module/Admin/Site.php:448 +#: src/Module/Admin/Site.php:451 msgid "Republish users to directory" msgstr "" -#: src/Module/Admin/Site.php:449 src/Module/Register.php:152 +#: src/Module/Admin/Site.php:452 src/Module/Register.php:152 msgid "Registration" msgstr "" -#: src/Module/Admin/Site.php:450 +#: src/Module/Admin/Site.php:453 msgid "File upload" msgstr "" -#: src/Module/Admin/Site.php:451 +#: src/Module/Admin/Site.php:454 msgid "Policies" msgstr "" -#: src/Module/Admin/Site.php:452 src/Module/Calendar/Event/Form.php:252 +#: src/Module/Admin/Site.php:455 src/Module/Calendar/Event/Form.php:252 #: src/Module/Contact.php:546 src/Module/Profile/Profile.php:276 msgid "Advanced" msgstr "" -#: src/Module/Admin/Site.php:453 +#: src/Module/Admin/Site.php:456 msgid "Auto Discovered Contact Directory" msgstr "" -#: src/Module/Admin/Site.php:454 +#: src/Module/Admin/Site.php:457 msgid "Performance" msgstr "" -#: src/Module/Admin/Site.php:455 +#: src/Module/Admin/Site.php:458 msgid "Worker" msgstr "" -#: src/Module/Admin/Site.php:456 +#: src/Module/Admin/Site.php:459 msgid "Message Relay" msgstr "" -#: src/Module/Admin/Site.php:457 +#: src/Module/Admin/Site.php:460 msgid "" "Use the command \"console relay\" in the command line to add or remove " "relays." msgstr "" -#: src/Module/Admin/Site.php:458 +#: src/Module/Admin/Site.php:461 msgid "The system is not subscribed to any relays at the moment." msgstr "" -#: src/Module/Admin/Site.php:459 +#: src/Module/Admin/Site.php:462 msgid "The system is currently subscribed to the following relays:" msgstr "" -#: src/Module/Admin/Site.php:462 +#: src/Module/Admin/Site.php:465 msgid "Relocate Node" msgstr "" -#: src/Module/Admin/Site.php:463 +#: src/Module/Admin/Site.php:466 msgid "" "Relocating your node enables you to change the DNS domain of this node and " "keep all the existing users and posts. This process takes a while and can " "only be started from the relocate console command like this:" msgstr "" -#: src/Module/Admin/Site.php:464 +#: src/Module/Admin/Site.php:467 msgid "(Friendica directory)# bin/console relocate https://newdomain.com" msgstr "" -#: src/Module/Admin/Site.php:467 +#: src/Module/Admin/Site.php:470 msgid "Site name" msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:471 msgid "Sender Email" msgstr "" -#: src/Module/Admin/Site.php:468 +#: src/Module/Admin/Site.php:471 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:472 msgid "Name of the system actor" msgstr "" -#: src/Module/Admin/Site.php:469 +#: src/Module/Admin/Site.php:472 msgid "" "Name of the internal system account that is used to perform ActivityPub " "requests. This must be an unused username. If set, this can't be changed " "again." msgstr "" -#: src/Module/Admin/Site.php:470 +#: src/Module/Admin/Site.php:473 msgid "Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:471 +#: src/Module/Admin/Site.php:474 msgid "Email Banner/Logo" msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:475 msgid "Shortcut icon" msgstr "" -#: src/Module/Admin/Site.php:472 +#: src/Module/Admin/Site.php:475 msgid "Link to an icon that will be used for browsers." msgstr "" -#: src/Module/Admin/Site.php:473 +#: src/Module/Admin/Site.php:476 msgid "Touch icon" msgstr "" -#: src/Module/Admin/Site.php:473 +#: src/Module/Admin/Site.php:476 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:477 msgid "Additional Info" msgstr "" -#: src/Module/Admin/Site.php:474 +#: src/Module/Admin/Site.php:477 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/servers." msgstr "" -#: src/Module/Admin/Site.php:475 +#: src/Module/Admin/Site.php:478 msgid "System language" msgstr "" -#: src/Module/Admin/Site.php:476 +#: src/Module/Admin/Site.php:479 msgid "System theme" msgstr "" -#: src/Module/Admin/Site.php:476 +#: src/Module/Admin/Site.php:479 #, php-format msgid "" "Default system theme - may be over-ridden by user profiles - Change default theme settings" msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:480 msgid "Mobile system theme" msgstr "" -#: src/Module/Admin/Site.php:477 +#: src/Module/Admin/Site.php:480 msgid "Theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:481 msgid "Force SSL" msgstr "" -#: src/Module/Admin/Site.php:478 +#: src/Module/Admin/Site.php:481 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:482 msgid "Show help entry from navigation menu" msgstr "" -#: src/Module/Admin/Site.php:479 +#: src/Module/Admin/Site.php:482 msgid "" "Displays the menu entry for the Help pages from the navigation menu. It is " "always accessible by calling /help directly." msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:483 msgid "Single user instance" msgstr "" -#: src/Module/Admin/Site.php:480 +#: src/Module/Admin/Site.php:483 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:485 msgid "Maximum image size" msgstr "" -#: src/Module/Admin/Site.php:482 +#: src/Module/Admin/Site.php:485 #, php-format msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " @@ -4610,35 +4610,35 @@ msgid "" "to %s (%s byte)" msgstr "" -#: src/Module/Admin/Site.php:486 +#: src/Module/Admin/Site.php:489 msgid "Maximum image length" msgstr "" -#: src/Module/Admin/Site.php:486 +#: src/Module/Admin/Site.php:489 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: src/Module/Admin/Site.php:487 +#: src/Module/Admin/Site.php:490 msgid "JPEG image quality" msgstr "" -#: src/Module/Admin/Site.php:487 +#: src/Module/Admin/Site.php:490 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: src/Module/Admin/Site.php:489 +#: src/Module/Admin/Site.php:492 msgid "Register policy" msgstr "" -#: src/Module/Admin/Site.php:490 +#: src/Module/Admin/Site.php:493 msgid "Maximum Users" msgstr "" -#: src/Module/Admin/Site.php:490 +#: src/Module/Admin/Site.php:493 msgid "" "If defined, the register policy is automatically closed when the given " "number of users is reached and reopens the registry when the number drops " @@ -4646,168 +4646,168 @@ msgid "" "not when the policy is set to approval." msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:494 msgid "Maximum Daily Registrations" msgstr "" -#: src/Module/Admin/Site.php:491 +#: src/Module/Admin/Site.php:494 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: src/Module/Admin/Site.php:492 +#: src/Module/Admin/Site.php:495 msgid "Register text" msgstr "" -#: src/Module/Admin/Site.php:492 +#: src/Module/Admin/Site.php:495 msgid "" "Will be displayed prominently on the registration page. You can use BBCode " "here." msgstr "" -#: src/Module/Admin/Site.php:493 +#: src/Module/Admin/Site.php:496 msgid "Forbidden Nicknames" msgstr "" -#: src/Module/Admin/Site.php:493 +#: src/Module/Admin/Site.php:496 msgid "" "Comma separated list of nicknames that are forbidden from registration. " "Preset is a list of role names according RFC 2142." msgstr "" -#: src/Module/Admin/Site.php:494 +#: src/Module/Admin/Site.php:497 msgid "Accounts abandoned after x days" msgstr "" -#: src/Module/Admin/Site.php:494 +#: src/Module/Admin/Site.php:497 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: src/Module/Admin/Site.php:495 +#: src/Module/Admin/Site.php:498 msgid "Allowed friend domains" msgstr "" -#: src/Module/Admin/Site.php:495 +#: src/Module/Admin/Site.php:498 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: src/Module/Admin/Site.php:496 +#: src/Module/Admin/Site.php:499 msgid "Allowed email domains" msgstr "" -#: src/Module/Admin/Site.php:496 +#: src/Module/Admin/Site.php:499 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: src/Module/Admin/Site.php:497 +#: src/Module/Admin/Site.php:500 msgid "No OEmbed rich content" msgstr "" -#: src/Module/Admin/Site.php:497 +#: src/Module/Admin/Site.php:500 msgid "" "Don't show the rich content (e.g. embedded PDF), except from the domains " "listed below." msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:501 msgid "Trusted third-party domains" msgstr "" -#: src/Module/Admin/Site.php:498 +#: src/Module/Admin/Site.php:501 msgid "" "Comma separated list of domains from which content is allowed to be embedded " "in posts like with OEmbed. All sub-domains of the listed domains are allowed " "as well." msgstr "" -#: src/Module/Admin/Site.php:499 +#: src/Module/Admin/Site.php:502 msgid "Block public" msgstr "" -#: src/Module/Admin/Site.php:499 +#: src/Module/Admin/Site.php:502 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:503 msgid "Force publish" msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:503 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: src/Module/Admin/Site.php:500 +#: src/Module/Admin/Site.php:503 msgid "Enabling this may violate privacy laws like the GDPR" msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:504 msgid "Global directory URL" msgstr "" -#: src/Module/Admin/Site.php:501 +#: src/Module/Admin/Site.php:504 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:505 msgid "Private posts by default for new users" msgstr "" -#: src/Module/Admin/Site.php:502 +#: src/Module/Admin/Site.php:505 msgid "" "Set default post permissions for all new members to the default privacy " "circle rather than public." msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:506 msgid "Don't include post content in email notifications" msgstr "" -#: src/Module/Admin/Site.php:503 +#: src/Module/Admin/Site.php:506 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:507 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: src/Module/Admin/Site.php:504 +#: src/Module/Admin/Site.php:507 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:508 msgid "Don't embed private images in posts" msgstr "" -#: src/Module/Admin/Site.php:505 +#: src/Module/Admin/Site.php:508 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:509 msgid "Explicit Content" msgstr "" -#: src/Module/Admin/Site.php:506 +#: src/Module/Admin/Site.php:509 msgid "" "Set this to announce that your node is used mostly for explicit content that " "might not be suited for minors. This information will be published in the " @@ -4816,319 +4816,319 @@ msgid "" "will be shown at the user registration page." msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:510 msgid "Proxify external content" msgstr "" -#: src/Module/Admin/Site.php:507 +#: src/Module/Admin/Site.php:510 msgid "" "Route external content via the proxy functionality. This is used for example " "for some OEmbed accesses and in some other rare cases." msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:511 msgid "Only local search" msgstr "" -#: src/Module/Admin/Site.php:508 +#: src/Module/Admin/Site.php:511 msgid "" "Blocks search for users who are not logged in to prevent crawlers from " "blocking your system." msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:512 msgid "Blocked tags for trending tags" msgstr "" -#: src/Module/Admin/Site.php:509 +#: src/Module/Admin/Site.php:512 msgid "" "Comma separated list of hashtags that shouldn't be displayed in the trending " "tags." msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:513 msgid "Cache contact avatars" msgstr "" -#: src/Module/Admin/Site.php:510 +#: src/Module/Admin/Site.php:513 msgid "" "Locally store the avatar pictures of the contacts. This uses a lot of " "storage space but it increases the performance." msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:514 msgid "Allow Users to set remote_self" msgstr "" -#: src/Module/Admin/Site.php:511 +#: src/Module/Admin/Site.php:514 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:515 msgid "Adjust the feed poll frequency" msgstr "" -#: src/Module/Admin/Site.php:512 +#: src/Module/Admin/Site.php:515 msgid "Automatically detect and set the best feed poll frequency." msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:516 msgid "Minimum poll interval" msgstr "" -#: src/Module/Admin/Site.php:513 +#: src/Module/Admin/Site.php:516 msgid "" "Minimal distance in minutes between two polls for mail and feed contacts. " "Reasonable values are between 1 and 59." msgstr "" -#: src/Module/Admin/Site.php:514 +#: src/Module/Admin/Site.php:517 msgid "Enable multiple registrations" msgstr "" -#: src/Module/Admin/Site.php:514 +#: src/Module/Admin/Site.php:517 msgid "Enable users to register additional accounts for use as pages." msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:518 msgid "Enable OpenID" msgstr "" -#: src/Module/Admin/Site.php:515 +#: src/Module/Admin/Site.php:518 msgid "Enable OpenID support for registration and logins." msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:519 msgid "Enable full name check" msgstr "" -#: src/Module/Admin/Site.php:516 +#: src/Module/Admin/Site.php:519 msgid "" "Prevents users from registering with a display name with fewer than two " "parts separated by spaces." msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:520 msgid "Email administrators on new registration" msgstr "" -#: src/Module/Admin/Site.php:517 +#: src/Module/Admin/Site.php:520 msgid "" "If enabled and the system is set to an open registration, an email for each " "new registration is sent to the administrators." msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:521 msgid "Community pages for visitors" msgstr "" -#: src/Module/Admin/Site.php:518 +#: src/Module/Admin/Site.php:521 msgid "" "Which community pages should be available for visitors. Local users always " "see both pages." msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:522 msgid "Posts per user on community page" msgstr "" -#: src/Module/Admin/Site.php:519 +#: src/Module/Admin/Site.php:522 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "\"Global Community\")" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:524 msgid "Enable Mail support" msgstr "" -#: src/Module/Admin/Site.php:521 +#: src/Module/Admin/Site.php:524 msgid "" "Enable built-in mail support to poll IMAP folders and to reply via mail." msgstr "" -#: src/Module/Admin/Site.php:522 +#: src/Module/Admin/Site.php:525 msgid "" "Mail support can't be enabled because the PHP IMAP module is not installed." msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:526 msgid "Enable OStatus support" msgstr "" -#: src/Module/Admin/Site.php:523 +#: src/Module/Admin/Site.php:526 msgid "" "Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public." msgstr "" -#: src/Module/Admin/Site.php:525 +#: src/Module/Admin/Site.php:528 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:529 msgid "Enable Diaspora support" msgstr "" -#: src/Module/Admin/Site.php:526 +#: src/Module/Admin/Site.php:529 msgid "" "Enable built-in Diaspora network compatibility for communicating with " "diaspora servers." msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:530 msgid "Verify SSL" msgstr "" -#: src/Module/Admin/Site.php:527 +#: src/Module/Admin/Site.php:530 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: src/Module/Admin/Site.php:528 +#: src/Module/Admin/Site.php:531 msgid "Proxy user" msgstr "" -#: src/Module/Admin/Site.php:528 +#: src/Module/Admin/Site.php:531 msgid "User name for the proxy server." msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:532 msgid "Proxy URL" msgstr "" -#: src/Module/Admin/Site.php:529 +#: src/Module/Admin/Site.php:532 msgid "" "If you want to use a proxy server that Friendica should use to connect to " "the network, put the URL of the proxy here." msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:533 msgid "Network timeout" msgstr "" -#: src/Module/Admin/Site.php:530 +#: src/Module/Admin/Site.php:533 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: src/Module/Admin/Site.php:531 +#: src/Module/Admin/Site.php:534 msgid "Maximum Load Average" msgstr "" -#: src/Module/Admin/Site.php:531 +#: src/Module/Admin/Site.php:534 #, php-format msgid "" "Maximum system load before delivery and poll processes are deferred - " "default %d." msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:535 msgid "Minimal Memory" msgstr "" -#: src/Module/Admin/Site.php:532 +#: src/Module/Admin/Site.php:535 msgid "" "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:536 msgid "Periodically optimize tables" msgstr "" -#: src/Module/Admin/Site.php:533 +#: src/Module/Admin/Site.php:536 msgid "Periodically optimize tables like the cache and the workerqueue" msgstr "" -#: src/Module/Admin/Site.php:535 +#: src/Module/Admin/Site.php:538 msgid "Discover followers/followings from contacts" msgstr "" -#: src/Module/Admin/Site.php:535 +#: src/Module/Admin/Site.php:538 msgid "" "If enabled, contacts are checked for their followers and following contacts." msgstr "" -#: src/Module/Admin/Site.php:536 +#: src/Module/Admin/Site.php:539 msgid "None - deactivated" msgstr "" -#: src/Module/Admin/Site.php:537 +#: src/Module/Admin/Site.php:540 msgid "" "Local contacts - contacts of our local contacts are discovered for their " "followers/followings." msgstr "" -#: src/Module/Admin/Site.php:538 +#: src/Module/Admin/Site.php:541 msgid "" "Interactors - contacts of our local contacts and contacts who interacted on " "locally visible postings are discovered for their followers/followings." msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:543 msgid "Only update contacts/servers with local data" msgstr "" -#: src/Module/Admin/Site.php:540 +#: src/Module/Admin/Site.php:543 msgid "" "If enabled, the system will only look for changes in contacts and servers " "that engaged on this system by either being in a contact list of a user or " "when posts or comments exists from the contact on this system." msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:544 msgid "Synchronize the contacts with the directory server" msgstr "" -#: src/Module/Admin/Site.php:541 +#: src/Module/Admin/Site.php:544 msgid "" "if enabled, the system will check periodically for new contacts on the " "defined directory server." msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:546 msgid "Discover contacts from other servers" msgstr "" -#: src/Module/Admin/Site.php:543 +#: src/Module/Admin/Site.php:546 msgid "" "Periodically query other servers for contacts and servers that they know of. " "The system queries Friendica, Mastodon and Hubzilla servers. Keep it " "deactivated on small machines to decrease the database size and load." msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:547 msgid "Days between requery" msgstr "" -#: src/Module/Admin/Site.php:544 +#: src/Module/Admin/Site.php:547 msgid "" "Number of days after which a server is requeried for their contacts and " "servers it knows of. This is only used when the discovery is activated." msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:548 msgid "Search the local directory" msgstr "" -#: src/Module/Admin/Site.php:545 +#: src/Module/Admin/Site.php:548 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:550 msgid "Publish server information" msgstr "" -#: src/Module/Admin/Site.php:547 +#: src/Module/Admin/Site.php:550 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -5136,50 +5136,50 @@ msgid "" "href=\"http://the-federation.info/\">the-federation.info for details." msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:552 msgid "Check upstream version" msgstr "" -#: src/Module/Admin/Site.php:549 +#: src/Module/Admin/Site.php:552 msgid "" "Enables checking for new Friendica versions at github. If there is a new " "version, you will be informed in the admin panel overview." msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:553 msgid "Suppress Tags" msgstr "" -#: src/Module/Admin/Site.php:550 +#: src/Module/Admin/Site.php:553 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:554 msgid "Clean database" msgstr "" -#: src/Module/Admin/Site.php:551 +#: src/Module/Admin/Site.php:554 msgid "" "Remove old remote items, orphaned database records and old content from some " "other helper tables." msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:555 msgid "Lifespan of remote items" msgstr "" -#: src/Module/Admin/Site.php:552 +#: src/Module/Admin/Site.php:555 msgid "" "When the database cleanup is enabled, this defines the days after which " "remote items will be deleted. Own items, and marked or filed items are " "always kept. 0 disables this behaviour." msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:556 msgid "Lifespan of unclaimed items" msgstr "" -#: src/Module/Admin/Site.php:553 +#: src/Module/Admin/Site.php:556 msgid "" "When the database cleanup is enabled, this defines the days after which " "unclaimed remote items (mostly content from the relay) will be deleted. " @@ -5187,295 +5187,307 @@ msgid "" "items if set to 0." msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:557 msgid "Lifespan of raw conversation data" msgstr "" -#: src/Module/Admin/Site.php:554 +#: src/Module/Admin/Site.php:557 msgid "" "The conversation data is used for ActivityPub and OStatus, as well as for " "debug purposes. It should be safe to remove it after 14 days, default is 90 " "days." msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:558 msgid "Maximum numbers of comments per post" msgstr "" -#: src/Module/Admin/Site.php:555 +#: src/Module/Admin/Site.php:558 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:559 msgid "Maximum numbers of comments per post on the display page" msgstr "" -#: src/Module/Admin/Site.php:556 +#: src/Module/Admin/Site.php:559 msgid "" "How many comments should be shown on the single view for each post? Default " "value is 1000." msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "Items per page" msgstr "" -#: src/Module/Admin/Site.php:557 +#: src/Module/Admin/Site.php:560 msgid "" "Number of items per page in stream pages (network, community, profile/" "contact statuses, search)." msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "Items per page for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:558 +#: src/Module/Admin/Site.php:561 msgid "" "Number of items per page in stream pages (network, community, profile/" "contact statuses, search) for mobile devices." msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "Temp path" msgstr "" -#: src/Module/Admin/Site.php:559 +#: src/Module/Admin/Site.php:562 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:563 msgid "Only search in tags" msgstr "" -#: src/Module/Admin/Site.php:560 +#: src/Module/Admin/Site.php:563 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "Generate counts per contact circle when calculating network count" msgstr "" -#: src/Module/Admin/Site.php:561 +#: src/Module/Admin/Site.php:564 msgid "" "On systems with users that heavily use contact circles the query can be very " "expensive." msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:565 msgid "Process \"view\" activities" msgstr "" -#: src/Module/Admin/Site.php:562 +#: src/Module/Admin/Site.php:565 msgid "" "\"view\" activities are mostly geberated by Peertube systems. Per default " "they are not processed for performance reasons. Only activate this option on " "performant system." msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "Days, after which a contact is archived" msgstr "" -#: src/Module/Admin/Site.php:563 +#: src/Module/Admin/Site.php:566 msgid "" "Number of days that we try to deliver content or to update the contact data " "before we archive a contact." msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:568 msgid "Maximum number of parallel workers" msgstr "" -#: src/Module/Admin/Site.php:565 +#: src/Module/Admin/Site.php:568 #, php-format msgid "" "On shared hosters set this to %d. On larger systems, values of %d are great. " "Default value is %d." msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "Maximum load for workers" msgstr "" -#: src/Module/Admin/Site.php:566 +#: src/Module/Admin/Site.php:569 msgid "Maximum load that causes a cooldown before each worker function call." msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 msgid "Enable fastlane" msgstr "" -#: src/Module/Admin/Site.php:567 +#: src/Module/Admin/Site.php:570 msgid "" "When enabed, the fastlane mechanism starts an additional worker if processes " "with higher priority are blocked by processes of lower priority." msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:571 msgid "Decoupled receiver" msgstr "" -#: src/Module/Admin/Site.php:568 +#: src/Module/Admin/Site.php:571 msgid "" "Decouple incoming ActivityPub posts by processing them in the background via " "a worker process. Only enable this on fast systems." msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:572 msgid "Cron interval" msgstr "" -#: src/Module/Admin/Site.php:569 +#: src/Module/Admin/Site.php:572 msgid "Minimal period in minutes between two calls of the \"Cron\" worker job." msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "Worker defer limit" msgstr "" -#: src/Module/Admin/Site.php:570 +#: src/Module/Admin/Site.php:573 msgid "" "Per default the systems tries delivering for 15 times before dropping it." msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:574 +msgid "Worker fetch limit" +msgstr "" + +#: src/Module/Admin/Site.php:574 +msgid "" +"Number of worker tasks that are fetched in a single query. Higher values " +"should increase the performance, too high values will mostly likely decrease " +"it. Only change it, when you know how to measure the performance of your " +"system." +msgstr "" + +#: src/Module/Admin/Site.php:576 msgid "Direct relay transfer" msgstr "" -#: src/Module/Admin/Site.php:572 +#: src/Module/Admin/Site.php:576 msgid "" "Enables the direct transfer to other servers without using the relay servers" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:577 msgid "Relay scope" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:577 msgid "" "Can be \"all\" or \"tags\". \"all\" means that every public post should be " "received. \"tags\" means that only posts with selected tags should be " "received." msgstr "" -#: src/Module/Admin/Site.php:573 src/Module/Contact/Profile.php:309 +#: src/Module/Admin/Site.php:577 src/Module/Contact/Profile.php:309 #: src/Module/Settings/TwoFactor/Index.php:146 msgid "Disabled" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:577 msgid "all" msgstr "" -#: src/Module/Admin/Site.php:573 +#: src/Module/Admin/Site.php:577 msgid "tags" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:578 msgid "Server tags" msgstr "" -#: src/Module/Admin/Site.php:574 +#: src/Module/Admin/Site.php:578 msgid "Comma separated list of tags for the \"tags\" subscription." msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:579 msgid "Deny Server tags" msgstr "" -#: src/Module/Admin/Site.php:575 +#: src/Module/Admin/Site.php:579 msgid "Comma separated list of tags that are rejected." msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:580 msgid "Allow user tags" msgstr "" -#: src/Module/Admin/Site.php:576 +#: src/Module/Admin/Site.php:580 msgid "" "If enabled, the tags from the saved searches will used for the \"tags\" " "subscription in addition to the \"relay_server_tags\"." msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:581 msgid "Deny undetected languages" msgstr "" -#: src/Module/Admin/Site.php:577 +#: src/Module/Admin/Site.php:581 msgid "If enabled, posts with undetected languages will be rejected." msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:582 msgid "Language Quality" msgstr "" -#: src/Module/Admin/Site.php:578 +#: src/Module/Admin/Site.php:582 msgid "The minimum language quality that is required to accept the post." msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:583 msgid "Number of languages for the language detection" msgstr "" -#: src/Module/Admin/Site.php:579 +#: src/Module/Admin/Site.php:583 msgid "" "The system detects a list of languages per post. Only if the desired " "languages are in the list, the message will be accepted. The higher the " "number, the more posts will be falsely detected." msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:585 msgid "Maximum age of channel" msgstr "" -#: src/Module/Admin/Site.php:581 +#: src/Module/Admin/Site.php:585 msgid "" "This defines the maximum age of items that should be displayed in channels. " "This affects the channel performance." msgstr "" -#: src/Module/Admin/Site.php:582 +#: src/Module/Admin/Site.php:586 msgid "Maximum number of channel posts" msgstr "" -#: src/Module/Admin/Site.php:582 +#: src/Module/Admin/Site.php:586 msgid "" "For performance reasons, the channels use a dedicated table to store " "content. The higher the value the slower the channels." msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:587 msgid "Interaction score days" msgstr "" -#: src/Module/Admin/Site.php:583 +#: src/Module/Admin/Site.php:587 msgid "Number of days that are used to calculate the interaction score." msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:588 msgid "Maximum number of posts per author" msgstr "" -#: src/Module/Admin/Site.php:584 +#: src/Module/Admin/Site.php:588 msgid "" "Maximum number of posts per page by author. If there are more posts, then " "the post with the most interactions will be displayed." msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:589 msgid "Sharer interaction days" msgstr "" -#: src/Module/Admin/Site.php:585 +#: src/Module/Admin/Site.php:589 msgid "" "Number of days of the last interaction that are used to define which sharers " "are used for the \"sharers of sharers\" channel." msgstr "" -#: src/Module/Admin/Site.php:588 +#: src/Module/Admin/Site.php:592 msgid "Start Relocation" msgstr "" diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index ce82c249a4..393c1ec4a9 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -138,6 +138,7 @@ {{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$decoupled_receiver}} {{include file="field_input.tpl" field=$worker_defer_limit}} + {{include file="field_input.tpl" field=$worker_fetch_limit}}
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index aef0f1f4b0..e2fab6d8a9 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -290,6 +290,7 @@ {{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$decoupled_receiver}} {{include file="field_input.tpl" field=$worker_defer_limit}} + {{include file="field_input.tpl" field=$worker_fetch_limit}}