WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-cron.php

    r13725 r18659  
    2727}
    2828
     29// Uncached doing_cron transient fetch
     30function _get_cron_lock() {
     31    global $_wp_using_ext_object_cache, $wpdb;
     32
     33    $value = 0;
     34    if ( $_wp_using_ext_object_cache ) {
     35        // Skip local cache and force refetch of doing_cron transient in case
     36        // another processs updated the cache
     37        $value = wp_cache_get( 'doing_cron', 'transient', true );
     38    } else {
     39        $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
     40        if ( is_object( $row ) )
     41            $value = $row->option_value;
     42    }
     43
     44    return $value;
     45}
     46
    2947if ( false === $crons = _get_cron_array() )
    3048    die();
     
    3654    die();
    3755
    38 foreach ($crons as $timestamp => $cronhooks) {
     56$doing_cron_transient = get_transient( 'doing_cron');
     57
     58// Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
     59if ( empty( $doing_wp_cron ) ) {
     60    if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
     61        // Called from external script/job. Try setting a lock.
     62        if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $local_time ) )
     63            return;
     64        $doing_cron_transient = $doing_wp_cron = time();
     65        set_transient( 'doing_cron', $doing_wp_cron );
     66    } else {
     67        $doing_wp_cron = $_GET[ 'doing_wp_cron' ];
     68    }
     69}
     70
     71// Check lock
     72if ( $doing_cron_transient != $doing_wp_cron )
     73    return;
     74
     75foreach ( $crons as $timestamp => $cronhooks ) {
    3976    if ( $timestamp > $local_time )
    4077        break;
    4178
    42     foreach ($cronhooks as $hook => $keys) {
     79    foreach ( $cronhooks as $hook => $keys ) {
    4380
    44         foreach ($keys as $k => $v) {
     81        foreach ( $keys as $k => $v ) {
    4582
    4683            $schedule = $v['schedule'];
    4784
    48             if ($schedule != false) {
     85            if ( $schedule != false ) {
    4986                $new_args = array($timestamp, $schedule, $hook, $v['args']);
    5087                call_user_func_array('wp_reschedule_event', $new_args);
    5188            }
    5289
    53             wp_unschedule_event($timestamp, $hook, $v['args']);
     90            wp_unschedule_event( $timestamp, $hook, $v['args'] );
    5491
    55             do_action_ref_array($hook, $v['args']);
     92            do_action_ref_array( $hook, $v['args'] );
     93
     94            // If the hook ran too long and another cron process stole the lock, quit.
     95            if ( _get_cron_lock() != $doing_wp_cron )
     96                return;
    5697        }
    5798    }
    5899}
    59100
     101if ( _get_cron_lock() == $doing_wp_cron )
     102    delete_transient( 'doing_cron' );
     103
    60104die();
Note: See TracChangeset for help on using the changeset viewer.