Changeset 8919

Timestamp:

06/05/2019 04:52:17 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Search: Remove debug and add specific errors in the case of a non-200 response.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

@@ -226 +226 @@
         $cache_key    = md5( $json_es_args );
         $lock_key     = 'lock-' . $cache_key;
-        $count_key    = 'count-' . $cache_key;
 
         // If the Query args were not able to be encoded, bail.
@@ -247 +246 @@
 
         if ( $do_fresh_request ) {
-            // Keep track of the number of concurrent requests for this key
-            wp_cache_set( $count_key, 1, self::CACHE_GROUP, 60 );
 
             // If the error volume is high, there's a proportionally lower chance that we'll actually attempt to hit the API.
@@ -276 +273 @@
                     $this->search_error( 'http error ' . $request->get_error_message(), E_USER_WARNING );
                 } else {
-                    $this->search_error( 'http status ' . wp_remote_retrieve_response_code( $request ), E_USER_WARNING );
+                    $es_error = json_decode( wp_remote_retrieve_body( $request ), true );
+
+                    $this->search_error(
+                        sprintf( 'http status %d %s %s',
+                            wp_remote_retrieve_response_code( $request ),
+                            $es_error['error'] ?? '',
+                            $es_error['message'] ?? ''
+                        ),
+                        E_USER_WARNING
+                    );
                 }
 
@@ -314 +320 @@
             // Stampede protection has kicked in, AND we have no stale cached value to display. That's bad - possibly indicates cache exhaustion
             if ( false === $response ) {
-                // Keep a track of how many cache stampede's happen per minute.
-                wp_cache_incr( 'search-stampede-failures', 1, self::CACHE_GROUP ) || wp_cache_set( 'search-stampede-failures', 1, self::CACHE_GROUP, 60 );
-
-                // Include the number of times this branch has been hit
-                $request_count = wp_cache_incr( $count_key, 1, self::CACHE_GROUP );
-                trigger_error( 'Plugin directory search: no cached results available during stampede. Requests: ' . $request_count, E_USER_WARNING );
+                trigger_error( 'Plugin directory search: no cached results available during stampede.', E_USER_WARNING );
             }
         }