Changeset 4566

Timestamp:

12/22/2016 01:54:34 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Handle API failures better, and output 'null' when an individual plugin API call fails, for backwards compatibility.

Fixes #2338

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php

@@ -71 +71 @@
                         if ( 200 != $response->status ) {
                                 $response = array( 'error' => 'Plugin not found.' );
-                                wp_cache_set( $cache_key, $response, self::CACHE_GROUP, 60*60 ); // 1 hour TTL for 404's?
+                                wp_cache_set( $cache_key, $response, self::CACHE_GROUP, 15*60 ); // shorter TTL for missing/erroring plugins.
                         } else {
                                 $response = $response->data;
@@ -82 +82 @@
                 }
 
+                // Backwards compatibility; the API returns null in case of error..
+                if ( isset( $response['error'] ) ) {
+                        $this->output( null );
+                        return;
+                }
+
+
                 // Only include the fields requested.
-                $response = $this->remove_unexpected_fields( $response, $request, 'plugin_information' );
+                if ( ! isset( $response['error'] ) ) {
+                        $response = $this->remove_unexpected_fields( $response, $request, 'plugin_information' );
+                }
 
                 $this->output( (object) $response );
@@ -148 +157 @@
                         $response = $this->internal_rest_api_call( 'plugins/v1/query-plugins', $request->query_plugins_params_for_query() );
                         if ( 200 != $response->status ) {
-                                $this->output( (object) array( 'error' => 'Query Failed.' ) );
-                                return;
+                                $response = array( 'error' => 'Query Failed.' );
+                                wp_cache_set( $cache_key, $response, self::CACHE_GROUP, 30 ); // Short expiry for when we've got issues
                         } else {
                                 $response = $response->data;
@@ -156 +165 @@
                 }
 
+                if ( isset( $response['error'] ) ) {
+                        $this->output( $response );
+                        return;
+                }
+
                 // Fill in the plugin details
                 foreach ( $response['plugins'] as $i => $plugin_slug ) {
-                        $response['plugins'][ $i ] = $this->plugin_information( new Plugins_Info_API_Request( array( 'slug' => $plugin_slug, 'locale' => $request->locale ) ), true );
+                        $plugin = $this->plugin_information( new Plugins_Info_API_Request( array( 'slug' => $plugin_slug, 'locale' => $request->locale ) ), true );
+                        if ( isset( $plugin['error'] ) ) {
+                                unset( $response['plugins'][ $i ] );
+                                continue;
+                        }
+
+                        $response['plugins'][ $i ] = $plugin;
                 }
 
@@ -185 +205 @@
                         if ( 200 != $response->status ) {
                                 $response = array( 'error' => 'Temporarily Unavailable' );
+                                wp_cache_set( $cache_key, $response, self::CACHE_GROUP, 30 ); // Short expiry for when we've got issues
                         } else {
                                 $response = $response->data;
                                 wp_cache_set( $cache_key, $response, self::CACHE_GROUP, self::CACHE_EXPIRY );
                         }
+                }
+
+                if ( isset( $response['error'] ) ) {
+                        $this->output( (object) $response );
+                        return;
                 }