tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7493 from annando/dont-fork-foreground

Browse source 
Don't fork worker on frontend by default
This commit is contained in:
Philipp 2019-08-09 00:00:31 +02:00 committed by GitHub
parent 3480891277 35a487ae30
commit 828a81d325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/item.php
View file

@ -835,7 +835,7 @@ function item_post(App $a) {
// When we are doing some forum posting via ! we have to start the notifier manually. // When we are doing some forum posting via ! we have to start the notifier manually.
// These kind of posts don't initiate the notifier call in the item class. // These kind of posts don't initiate the notifier call in the item class.
if ($only_to_forum) { if ($only_to_forum) {
Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post_id); Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, $post_id);
} }
Logger::log('post_complete'); Logger::log('post_complete');

3
src/Core/Worker.php
View file

@ -1125,7 +1125,8 @@ class Worker
} }
$priority = PRIORITY_MEDIUM; $priority = PRIORITY_MEDIUM;
$dont_fork = Config::get("system", "worker_dont_fork", false); // Don't fork from frontend tasks by default
$dont_fork = Config::get("system", "worker_dont_fork", false) || !\get_app()->isBackend();
$created = DateTimeFormat::utcNow(); $created = DateTimeFormat::utcNow();
$force_priority = false; $force_priority = false;