jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"worker_fetch_limit" is moved as well

Browse source
This commit is contained in:
Michael 2023-12-03 22:49:35 +00:00
parent 8386768708
commit cb91800088
6 changed files with 267 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Admin/Site.php
View file

@ -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')]],

4
static/defaults.config.php
View file

@ -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)

4
static/settings.config.php
View file

@ -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,

500
view/lang/C/messages.po
View file

File diff suppressed because it is too large Load diff

1
view/templates/admin/site.tpl
View file

@ -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}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>

1
view/theme/frio/templates/admin/site.tpl
View file

@ -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}}
</div>
<div class="panel-footer">
<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>