jenkins-bot has submitted this change and it was merged.
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(-)
Approvals:
Chad: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
DCausse: Looks good to me, but someone else must approve
jenkins-bot: Verified
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: merged
Gerrit-Change-Id: Ic06a87d8b5647da58731de0c44a2f0d5587c764c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
