Remove jobs from queue if older than 1 week (#620)

* dont send emails older than 2 weeks

* add check to remove old jobs

* update jobs

* move to maybe_fix_stalled

* update jobs

* update version and readme

* update jobs

* reorganize and add comments

* remove error log

* remove error log and add comments

* update test

* update tests

Author: jamesros161

admin/class-boldgrid-backup-admin-jobs.php

@@ -259,31 +259,52 @@ public function post_jobs_email( $info ) {
 	 * Fix stalled jobs.
 	 *
 	 * @since 1.15.5
+	 * 
+	 * A stalled job can be a job that has been pending for over a week. This is usually due to
+	 * a CRON bug that has since been resolved in 1.16.9. If the job is older than a week, it will
+	 * be removed.
 	 *
-	 * A stalled job is a job who's status has been set to "running", however it's been running longer
-	 * than expected.
+	 * A stalled job can also be a job who's status has been set to "running"
+	 *  however it's been running longer than expected.
 	 *
 	 * For example, if a job is only supposed to take 1 minute, and it's been running for 3 hours, it's
 	 * stalled. Most likely the process was either killed and or had a fatal error.
 	 */
 	public function maybe_fix_stalled() {
 		$made_changes = false;
 
-		foreach ( $this->jobs as &$job ) {
-			if ( 'running' !== $job['status'] ) {
-				continue;
+		foreach ( $this->jobs as $key => &$job ) {
+			// Maybe delete old job if it's older than one week.
+			if ( preg_match('/-(\d{8})-\d{6}\.zip$/', $job['filepath'], $matches ) ) {
+				$date_str = $matches[1];
+			
+				// Create a DateTime object from the date string (format: YYYYMMDD)
+				$file_date = DateTime::createFromFormat( 'Ymd', $date_str );
+				
+				// Get the date for one week ago from now
+				$one_week_ago = new DateTime('-1 week');
+			
+				// Compare dates
+				if ( $file_date < $one_week_ago ) {
+					unset( $this->jobs[ $key ] );
+					$made_changes = true;
+					continue;
+				}
 			}
 
-			// Determine whether or not this job is stalled.
-			$time_limit = HOUR_IN_SECONDS;
-			$duration   = time() - $job['start_time'];
-			$is_stalled = $duration > $time_limit;
+			// Maybe update job if it is running, and has stalled.
+			if ( 'running' === $job['status'] ) {
+				// Determine whether or not this job is stalled.
+				$time_limit = HOUR_IN_SECONDS;
+				$duration   = time() - $job['start_time'];
+				$is_stalled = $duration > $time_limit;
 
-			if ( $is_stalled ) {
-				$job['end_time'] = time();
-				$job['status']   = 'fail';
+				if ( $is_stalled ) {
+					$job['end_time'] = time();
+					$job['status']   = 'fail';
 
-				$made_changes = true;
+					$made_changes = true;
+				}
 			}
 		}
 

boldgrid-backup.php

@@ -16,7 +16,7 @@
  *          Plugin Name: Total Upkeep
  *          Plugin URI: https://www.boldgrid.com/boldgrid-backup/
  *          Description: Automated backups, remote backup to Amazon S3 and Google Drive, stop website crashes before they happen and more. Total Upkeep is the backup solution you need.
- *          Version: 1.16.9
+ *          Version: 1.16.10
  *          Author: BoldGrid
  *          Author URI: https://www.boldgrid.com/
  *          License: GPL-2.0+

readme.txt

@@ -4,7 +4,7 @@ Tags: backup, cloud backup, database backup, restore, wordpress backup
 Requires at least: 5.0
 Tested up to: 6.7
 Requires PHP: 5.4
-Stable tag: 1.16.9
+Stable tag: 1.16.10
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -132,6 +132,10 @@ Have a problem? First, take a look at our [Getting Started](https://www.boldgrid
 
 == Changelog ==
 
+= 1.16.10 =
+Release Date: Feb 26, 2025
+* Bug Fix: Prevent old backlogged jobs from running due to a previous CRON bug.
+
 = 1.16.9 =
 Release Date: Feb 25, 2025
 * Bug Fix: PHP Warning: Undefined array key “is_running” [#614](https://github.com/BoldGrid/boldgrid-backup/issues/614)

tests/admin/test-class-boldgrid-backup-admin-jobs.php

@@ -32,19 +32,30 @@ class Test_Boldgrid_Backup_Admin_Jobs extends WP_UnitTestCase {
 	 * @since 1.15.5
 	 */
 	public function test_maybe_fix_stalled() {
-		$test_jobs = array(
+		$filepath     = '/some/file/boldgrid-backup-domain.com-0134567-' . date( 'Ymd' ) . '-123456.zip';
+		$old_job_path = '/some/file/boldgrid-backup-domain.com-0134567-' . date( 'Ymd', strtotime('-2 weeks') ) . '-123456.zip';
+		$test_jobs    = array(
 			array(
+				'filepath'   => $filepath,
 				'action'     => 'some_action_1',
 				'status'     => 'running',
 				// This job is not stalled. If the start time is right now, it's been running 0 seconds.
 				'start_time' => time(),
 			),
 			array(
+				'filepath'   => $filepath,
 				'action'     => 'some_action_2',
 				'status'     => 'running',
 				// This job was started 1 year ago. It should be flagged as being stalled.
 				'start_time' => time() - YEAR_IN_SECONDS,
 			),
+			array(
+				// This job was created over a week ago, so it should be removed.
+				'filepath'   => $old_job_path,
+				'action'     => 'some_action_3',
+				'status'     => 'running',
+				'start_time' => time(),
+			),
 		);
 
 		update_option( $this->jobs->option, $test_jobs );
@@ -55,6 +66,8 @@ public function test_maybe_fix_stalled() {
 		$this->assertEquals( 'running', $this->jobs->jobs[0]['status'] );
 
 		$this->assertEquals( 'fail', $this->jobs->jobs[1]['status'] );
+
+		$this->assertEquals( 2, count( $this->jobs->jobs ) );
 	}
 
 	/**