Changeset 18659 for trunk/wp-includes/cron.php

Timestamp:

09/09/2011 07:59:44 PM (13 years ago)

Author:

ryan

Message:

Improve cron locking. Avoid multiple cron processes looping over the same events. fixes #17462

File:

• trunk/wp-includes/cron.php (modified) (3 diffs)

trunk/wp-includes/cron.php

@@ -205 +205 @@
     * try to make this as atomic as possible by setting doing_cron switch
     */
-    $flag = get_transient('doing_cron');
-
-    if ( $flag > $local_time + 10*60 )
-        $flag = 0;
+    $lock = get_transient('doing_cron');
+
+    if ( $lock > $local_time + 10*60 )
+        $lock = 0;
 
     // don't run if another process is currently running it or more than once every 60 sec.
-    if ( $flag + 60 > $local_time )
+    if ( $lock + WP_CRON_LOCK_TIMEOUT > $local_time )
         return;
 
@@ -227 +227 @@
             return;
 
-        set_transient( 'doing_cron', $local_time );
+        $doing_wp_cron = $local_time;
+        set_transient( 'doing_cron', $doing_wp_cron );
 
         ob_start();
-        wp_redirect( add_query_arg('doing_wp_cron', '', stripslashes($_SERVER['REQUEST_URI'])) );
+        wp_redirect( add_query_arg('doing_wp_cron', $doing_wp_cron, stripslashes($_SERVER['REQUEST_URI'])) );
         echo ' ';
 
@@ -241 +242 @@
     }
 
-    set_transient( 'doing_cron', $local_time );
-
-    $cron_url = get_option( 'siteurl' ) . '/wp-cron.php?doing_wp_cron';
+    $doing_wp_cron = $local_time;
+    set_transient( 'doing_cron', $doing_wp_cron );
+
+    $cron_url = get_option( 'siteurl' ) . '/wp-cron.php?doing_wp_cron=' . $doing_wp_cron;
     wp_remote_post( $cron_url, array('timeout' => 0.01, 'blocking' => false, 'sslverify' => apply_filters('https_local_ssl_verify', true)) );
 }