Changeset 5233

Timestamp:

04/04/2017 04:59:12 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: SVN Watcher: Wait for 2 consequtive SVN failures to occur before throwing exceptions - a single network timeout is usually transitive.
This also switches cron tasks to be checked for / registered on init, to ensure that a failed recurring task (one which throws an exception) is re-registered in Cavalcade.

Fixes #2678

Location:

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

Files:

• cli/class-svn-watcher.php (modified) (1 diff)
• jobs/class-manager.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-svn-watcher.php

@@ -70 +70 @@
                 $logs = SVN::log( self::SVN_URL, array( $rev, $head_rev ) );
                 if ( $logs['errors'] ) {
-                        throw new Exception( "Could not fetch plugins.svn logs: " . implode( ', ', $logs['errors'] ) );
+                        if ( wp_cache_get( 'get_plugin_changes_between_failed', 'svn-watch' ) ) {
+                                // Set it again, so if the next request fails, this exception will be thrown again, until the issue is resolved.
+                                wp_cache_set( 'get_plugin_changes_between_failed', time(), 'svn-watch', 60 );
+
+                                throw new Exception( "Could not fetch plugins.svn logs: " . implode( ', ', $logs['errors'] ) );
+                        } else {
+                                // If the job fails again within the next minute, throw an exception (as above)
+                                // but for now, just silently let it re-try next iteration, hopefully it was a transient failure / network timeout.
+                                wp_cache_set( 'get_plugin_changes_between_failed', time(), 'svn-watch', 60 );
+                                return array();
+                        }
                 }
 

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

@@ -11 +11 @@
 
         /**
-         * A static method for the cron trigger to fire.
+         * Add all the actions for cron tasks and schedules.
          */
         public function __construct() {
                 // Register all the cron task handlers.
-                add_action( 'admin_init', array( $this, 'register_cron_tasks' ) );
+                add_action( 'init', array( $this, 'register_cron_tasks' ) );
                 add_filter( 'cron_schedules', array( $this, 'register_schedules' ) );