EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/333800 )

Change subject: Update changed error type for rejected regex queries
......................................................................

Update changed error type for rejected regex queries

Regex's look to now be rejected with type query_shard_exception,
so adding it to the list. As far as i can tell QueryParsingException
no longer exists in 5.6, so replacing all occurances with the new
QueryShardException.

Depends-On: I208a8dbcc2cb05af69af84a8a534ca8e8e03897c
Change-Id: I3cb0265a78e528394ec3e7acd5314b035ce9698c
---
M includes/ElasticaErrorHandler.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/00/333800/1

diff --git a/includes/ElasticaErrorHandler.php 
b/includes/ElasticaErrorHandler.php
index d13078a..4f7f1fa 100644
--- a/includes/ElasticaErrorHandler.php
+++ b/includes/ElasticaErrorHandler.php
@@ -86,7 +86,7 @@
                                        
'^too_complex_to_determinize_exception$',
                                        '^elasticsearch_parse_exception$',
                                        '^search_parse_exception$',
-                                       '^query_parsing_exception$',
+                                       '^query_shard_exception$',
                                        '^illegal_argument_exception$',
                                        '^too_many_clauses$'
                                ],
@@ -165,7 +165,7 @@
                // it happens.
                $cause = reset( $error['root_cause'] );
 
-               if ( $cause['type'] === 'query_parsing_exception' ) {
+               if ( $cause['type'] === 'query_shard_exception' ) {
                        // The important part of the parse error message is 
embedded a few levels down
                        // and comes before the next new line so lets slurp it 
up and log it rather than
                        // the huge clump of error.

-- 
To view, visit https://gerrit.wikimedia.org/r/333800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb0265a78e528394ec3e7acd5314b035ce9698c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to