Changeset 5453

Timestamp:

05/01/2017 11:00:53 AM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Update a scheduled job if another i18n import is triggered during the 15 minutes timeframe.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs

Files:

• class-manager.php (modified) (4 diffs)
• class-plugin-i18n-import.php (modified) (1 diff)
• class-plugin-import.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-manager.php

@@ -43 +43 @@
 
     /**
-     * Returns the latest time that the scheduled hook will run
-     *
-     * @param string $hook The hook to look for.
-     * @param string $when 'last' or 'next' for when the hook runs.
-     * @return bool|int False on failure, The timestamp on success.
-     */
+     * Returns the latest time that the scheduled hook will run.
+     *
+     * @param string $hook The hook to look for.
+     * @param string $when 'last' or 'next' for when the hook runs.
+     * @return bool|int False on failure, The timestamp on success.
+     */
     public static function get_scheduled_time( $hook, $when = 'last' ) {
 
@@ -64 +64 @@
             if ( isset( $cron[ $hook ] ) ) {
                 foreach ( $cron[ $hook ] as $key => $cron_item ) {
+                    // Cavalcade should present this field, if not, bail.
+                    if ( empty( $cron_item['_job'] ) ) {
+                        continue;
+                    }
+
                     if ( 'waiting' === $cron_item['_job']->status ) {
                         $timestamps[] = $timestamp;
@@ -84 +89 @@
 
     /**
-     * Reschedules a cavalcade job.
-     * This requires the usage of Cavalcade, and will fail without it.
-     *
-     * @param string $hook The Hook to reschedule.
-     * @param int $new_timestamp The time to reschedule it to.
-     * @param int $old_timestamp The specific job to schedule. Optional, will affect first job otherwise.
-     */
+     * Returns the current scheduled events of a hook.
+     *
+     * @param string   $hook           The hook to look for.
+     * @param int|bool $next_timestamp Optional. Returns events for a specific timestamp.
+     * @return array Scheduled events.
+     */
+    public static function get_scheduled_events( $hook, $next_timestamp = false ) {
+
+        // Flush the Cavalcade jobs cache, we need fresh data from the database.
+        wp_cache_delete( 'jobs', 'cavalcade-jobs' );
+
+        $crons = _get_cron_array();
+        if ( empty( $crons ) ) {
+            return [];
+        }
+
+        $events = [];
+
+        foreach ( $crons as $timestamp => $cron ) {
+            if ( isset( $cron[ $hook ] ) ) {
+                foreach ( $cron[ $hook ] as $key => $cron_item ) {
+                    // Cavalcade should present this field, if not, bail.
+                    if ( empty( $cron_item['_job'] ) ) {
+                        continue;
+                    }
+
+                    if ( 'waiting' !== $cron_item['_job']->status ) {
+                        continue;
+                    }
+
+                    if ( ! $next_timestamp || $next_timestamp === $timestamp ) {
+                        $events[] = [
+                            'hook'      => $cron_item['_job']->hook,
+                            'args'      => $cron_item['_job']->args,
+                            'nextrun'   => $timestamp,
+                        ];
+                    }
+                }
+            }
+        }
+
+        return $events;
+    }
+
+    /**
+     * Updates a cavalcade job.
+     *
+     * This requires the usage of Cavalcade, and will fail without it.
+     *
+     * @param string $hook           The hook to update.
+     * @param int    $next_timestamp The time of the schedule to update.
+     * @param array  $data           The data to update.
+     * @return bool True on success, false on error.
+     */
+    public static function update_scheduled_event( $hook, $next_timestamp, $data ) {
+        // Flush the Cavalcade jobs cache, we need fresh data from the database
+        wp_cache_delete( 'jobs', 'cavalcade-jobs' );
+
+        $crons = _get_cron_array();
+        foreach ( $crons as $timestamp => $cron ) {
+            if ( $next_timestamp !== $timestamp ) {
+                continue;
+            }
+
+            if ( isset( $cron[ $hook ] ) ) {
+                foreach ( $cron[ $hook ] as $key => $event ) {
+                    // Cavalcade should present this field, if not, bail.
+                    if ( empty( $event['_job'] ) ) {
+                        return false;
+                    }
+
+                    if ( 'waiting' !== $event['_job']->status ) {
+                        return false;
+                    }
+
+                    $event['_job']->args = $data['args'];
+                    $event['_job']->nextrun = $data['nextrun'];
+                    $event['_job']->save();
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Reschedules a cavalcade job.
+     * This requires the usage of Cavalcade, and will fail without it.
+     *
+     * @param string   $hook          The hook to reschedule.
+     * @param int|bool $new_timestamp The time to reschedule it to.
+     * @param int|bool $old_timestamp The specific job to schedule. Optional, will affect first job otherwise.
+     * @return bool True on success, false on error.
+     */
     public static function reschedule_event( $hook, $new_timestamp = false, $old_timestamp = false ) {
         $new_timestamp = $new_timestamp ?: time();
@@ -105 +199 @@
             if ( isset( $cron[ $hook ] ) ) {
                 foreach ( $cron[ $hook ] as $key => $event ) {
-                    // Cavalcade should present this field,if not, bail.
+                    // Cavalcade should present this field, if not, bail.
                     if ( empty( $event['_job'] ) ) {
                         return false;

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-i18n-import.php

@@ -17 +17 @@
      */
     public static function queue( $plugin_slug, $plugin_data ) {
-        // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
         $when_to_run = time() + 15 * MINUTE_IN_SECONDS;
-        if ( $next_scheuled = Manager::get_scheduled_time( "import_plugin_i18n:{$plugin_slug}", 'last' ) ) {
-            $when_to_run = $next_scheuled + HOUR_IN_SECONDS;
+        $next_scheduled = Manager::get_scheduled_time( "import_plugin_i18n:{$plugin_slug}", 'last' );
+
+        // Update a scheduled event if it doesn't run in the next minute.
+        if ( $next_scheduled && $next_scheduled > time() + 1 * MINUTE_IN_SECONDS ) {
+            $next_scheduled_events = Manager::get_scheduled_events( "import_plugin_i18n:{$plugin_slug}",$next_scheduled );
+            if ( $next_scheduled_events ) {
+                $next_scheduled_event = array_shift( $next_scheduled_events );
+
+                $next_scheduled_event['args'][0]['tags_touched'] = array_merge(
+                    $next_scheduled_event['args'][0]['tags_touched'],
+                    $plugin_data['tags_touched']
+                );
+
+                if ( $plugin_data['readme_touched'] ) {
+                    $next_scheduled_event['args'][0]['readme_touched'] = true;
+                }
+
+                if ( $plugin_data['code_touched'] ) {
+                    $next_scheduled_event['args'][0]['code_touched'] = true;
+                }
+
+                if ( $plugin_data['assets_touched'] ) {
+                    $next_scheduled_event['args'][0]['assets_touched'] = true;
+                }
+
+                $next_scheduled_event['args'][0]['revisions'] = array_merge(
+                    $next_scheduled_event['args'][0]['revisions'],
+                    $plugin_data['revisions']
+                );
+
+                $result = Manager::update_scheduled_event( "import_plugin_i18n:{$plugin_slug}", $next_scheduled, $next_scheduled_event );
+                if ( $result ) {
+                    return;
+                }
+            }
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php

@@ -15 +15 @@
         // To avoid a situation where two imports run concurrently, if one is already scheduled, run it 1hr later (We'll trigger it after the current one finishes).
         $when_to_run = time();
-        if ( $next_scheuled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
-            $when_to_run = $next_scheuled + HOUR_IN_SECONDS;
+        if ( $next_scheduled = Manager::get_scheduled_time( "import_plugin:{$plugin_slug}", 'last' ) ) {
+            $when_to_run = $next_scheduled + HOUR_IN_SECONDS;
         }