Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-02 11:26:02 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'release/1.7.49.4'

Browse Source
This commit is contained in:
Andy Miller
2025-09-03 17:37:22 -06:00
parent b642b2c999 b0dac5f4b4
commit 38075f9c86
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.7.49.4
## 09/03/2025
1. [](#bugfix)
* Fixed cron force running jobs severy minute! [#3951](https://github.com/getgrav/grav/issues/3951)
# v1.7.49.3 # v1.7.49.3
## 09/02/2025 ## 09/02/2025

5
composer.json
View File

@@ -87,10 +87,7 @@
"ext-exif": "Needed to use exif data from images." "ext-exif": "Needed to use exif data from images."
}, },
"config": { "config": {
"apcu-autoloader": true, "apcu-autoloader": true
"platform": {
"php": "7.3.6"
}
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

2
system/defines.php
View File

@@ -9,7 +9,7 @@
// Some standard defines // Some standard defines
define('GRAV', true); define('GRAV', true);
define('GRAV_VERSION', '1.7.49.3'); define('GRAV_VERSION', '1.7.49.4');
define('GRAV_SCHEMA', '1.7.0_2020-11-20_1'); define('GRAV_SCHEMA', '1.7.0_2020-11-20_1');
define('GRAV_TESTING', false); define('GRAV_TESTING', false);

11
system/src/Grav/Console/Cli/SchedulerCommand.php
View File

@@ -57,8 +57,14 @@ class SchedulerCommand extends GravCommand
'Force run all jobs or a specific job if you specify a specific Job ID', 'Force run all jobs or a specific job if you specify a specific Job ID',
false false
) )
->addOption(
'force',
'f',
InputOption::VALUE_NONE,
'Force all due jobs to run regardless of their schedule'
)
->setDescription('Run the Grav Scheduler. Best when integrated with system cron') ->setDescription('Run the Grav Scheduler. Best when integrated with system cron')
->setHelp("Running without any options will force the Scheduler to run through it's jobs and process them"); ->setHelp("Running without any options will process the Scheduler jobs based on their cron schedule. Use --force to run all jobs immediately.");
} }
/** /**
@@ -84,6 +90,7 @@ class SchedulerCommand extends GravCommand
$run = $input->getOption('run'); $run = $input->getOption('run');
$showDetails = $input->getOption('details'); $showDetails = $input->getOption('details');
$showJobs = $input->getOption('jobs'); $showJobs = $input->getOption('jobs');
$forceRun = $input->getOption('force');
// Handle running jobs first if -r flag is present // Handle running jobs first if -r flag is present
if ($run !== false) { if ($run !== false) {
@@ -256,7 +263,7 @@ class SchedulerCommand extends GravCommand
} }
} elseif (!$showJobs && !$showDetails && $run === false) { } elseif (!$showJobs && !$showDetails && $run === false) {
// Run scheduler only if no other options were provided // Run scheduler only if no other options were provided
$scheduler->run(null, true); $scheduler->run(null, $forceRun);
if ($input->getOption('verbose')) { if ($input->getOption('verbose')) {
$io->title('Running Scheduled Jobs'); $io->title('Running Scheduled Jobs');