Changeset 3247455

Timestamp:

02/26/2025 11:38:59 PM (2 weeks ago)

Author:

boldgrid

Message:

Release 1.16.10, see readme.txt for the changelog.

Location:

boldgrid-backup/tags/1.16.10

Files:

• admin/class-boldgrid-backup-admin-jobs.php (modified) (2 diffs)
• boldgrid-backup.php (modified) (1 diff)
• cli/verify-4d9704510f0f8b4b5c7a92125ea8bb7c.php (added)
• cli/verify-4feb057a01ab7ef35ea3b244569a003e.php (deleted)
• readme.txt (modified) (2 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (5 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)

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

@@ -260 +260 @@
      *
      * @since 1.15.5
-     *
-     * 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 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 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
@@ -270 +274 @@
         $made_changes = false;
 
-        foreach ( $this->jobs as &$job ) {
-            if ( 'running' !== $job['status'] ) {
-                continue;
-            }
-
-            // 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';
-
-                $made_changes = true;
+        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;
+                }
+            }
+
+            // 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';
+
+                    $made_changes = true;
+                }
             }
         }

boldgrid-backup/tags/1.16.10/boldgrid-backup.php

@@ -17 +17 @@
  *          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/

boldgrid-backup/tags/1.16.10/readme.txt

@@ -5 +5 @@
 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
@@ -133 +133 @@
 == 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

boldgrid-backup/tags/1.16.10/vendor/autoload.php

@@ -5 +5 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitb172d40be3a9b365c2d1a0f25f3e8f1b::getLoader();
+return ComposerAutoloaderInit78d8e655d3810d3d27ad6bf9ac094713::getLoader();

boldgrid-backup/tags/1.16.10/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitb172d40be3a9b365c2d1a0f25f3e8f1b
+class ComposerAutoloaderInit78d8e655d3810d3d27ad6bf9ac094713
 {
     private static $loader;
@@ -23 +23 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitb172d40be3a9b365c2d1a0f25f3e8f1b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit78d8e655d3810d3d27ad6bf9ac094713', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitb172d40be3a9b365c2d1a0f25f3e8f1b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit78d8e655d3810d3d27ad6bf9ac094713', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
@@ -31 +31 @@
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
@@ -52 +52 @@
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireb172d40be3a9b365c2d1a0f25f3e8f1b($fileIdentifier, $file);
+            composerRequire78d8e655d3810d3d27ad6bf9ac094713($fileIdentifier, $file);
         }
 
@@ -64 +64 @@
 }
 
-function composerRequireb172d40be3a9b365c2d1a0f25f3e8f1b($fileIdentifier, $file)
+function composerRequire78d8e655d3810d3d27ad6bf9ac094713($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

boldgrid-backup/tags/1.16.10/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b
+class ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713
 {
     public static $files = array (
@@ -420 +420 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitb172d40be3a9b365c2d1a0f25f3e8f1b::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit78d8e655d3810d3d27ad6bf9ac094713::$classMap;
 
         }, null, ClassLoader::class);