tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5482 from annando/issue-5467a

Browse source 
Issue 5467: Cron jobs hadn't been executed
This commit is contained in:
Tobias Diekershoff 2018-07-24 08:57:28 +02:00 committed by GitHub
parent f2b97f9320 432eec770b
commit 876081af82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/worker.php
View file

@ -11,8 +11,8 @@ use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
// Get options // Get options
$shortopts = 'sc'; $shortopts = 'sn';
$longopts = ['spawn', 'cron']; $longopts = ['spawn', 'no_cron'];
$options = getopt($shortopts, $longopts); $options = getopt($shortopts, $longopts);
// Ensure that worker.php is executed from the base path of the installation // Ensure that worker.php is executed from the base path of the installation
@ -52,7 +52,7 @@ if ($spawn) {
killme(); killme();
} }
$run_cron = array_key_exists('c', $options) || array_key_exists('cron', $options); $run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
Worker::processQueue($run_cron); Worker::processQueue($run_cron);

2
src/Core/Worker.php
View file

@ -1011,7 +1011,7 @@ class Worker
{ {
$command = 'bin/worker.php'; $command = 'bin/worker.php';
$args = [ 'cron' => $do_cron ]; $args = ['no_cron' => !$do_cron];
get_app()->proc_run($command, $args); get_app()->proc_run($command, $args);