Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/224655
Change subject: Use a better marker to detect regex filter errors ...................................................................... Use a better marker to detect regex filter errors The source_text filter error detection was broken somehow. Something to do with the 1.6 upgrade maybe. This is a more consistently returned marker. Change-Id: Ic06a87d8b5647da58731de0c44a2f0d5587c764c --- M includes/ElasticsearchIntermediary.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/55/224655/1 diff --git a/includes/ElasticsearchIntermediary.php b/includes/ElasticsearchIntermediary.php index cd94e57..0f7385c 100644 --- a/includes/ElasticsearchIntermediary.php +++ b/includes/ElasticsearchIntermediary.php @@ -251,7 +251,7 @@ // what else would have automatons and illegal argument exceptions. Just looking // for the exception won't suffice because other weird things could cause it. $seemsToUseRegexes = strpos( $message, 'import org.apache.lucene.util.automaton.*' ) !== false; - $usesExtraRegex = strpos( $message, 'org.wikimedia.search.extra.regex.SourceRegexFilter' ) !== false; + $usesExtraRegex = strpos( $message, 'source_text:/' ) !== false; $seemsToUseRegexes |= $usesExtraRegex; $marker = 'IllegalArgumentException['; $markerLocation = strpos( $message, $marker ); -- To view, visit https://gerrit.wikimedia.org/r/224655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic06a87d8b5647da58731de0c44a2f0d5587c764c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles <never...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits