Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60860
Change subject: Return empty searches with HTTP code 200
......................................................................
Return empty searches with HTTP code 200
Before, we returned all non-results as a 500. Since we now
catch 500s in MWSearch and log them, this meant actual
empty searches weren't being reported properly and looked
like errors.
Change-Id: Ib7c176650fbc92e481960d38c31170fdfcb21f97
---
M src/org/wikimedia/lsearch/frontend/SearchDaemon.java
M src/org/wikimedia/lsearch/search/SearchEngine.java
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/lucene-search-2
refs/changes/60/60860/1
diff --git a/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
b/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
index 3bd1240..e5e5ff1 100644
--- a/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
+++ b/src/org/wikimedia/lsearch/frontend/SearchDaemon.java
@@ -4,6 +4,8 @@
*/
package org.wikimedia.lsearch.frontend;
+import static org.wikimedia.lsearch.search.SearchEngine.EMPTY_SEARCH;
+
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -207,6 +209,8 @@
}
sendOutputLine("]]");
}
+ } else if(res.getErrorMsg().equals(EMPTY_SEARCH)) {
+ sendError(200, "Empty search",
res.getErrorMsg());
} else{
sendError(500, "Server error",
res.getErrorMsg());
}
diff --git a/src/org/wikimedia/lsearch/search/SearchEngine.java
b/src/org/wikimedia/lsearch/search/SearchEngine.java
index bf5e24c..b98a925 100644
--- a/src/org/wikimedia/lsearch/search/SearchEngine.java
+++ b/src/org/wikimedia/lsearch/search/SearchEngine.java
@@ -62,6 +62,8 @@
public class SearchEngine {
static org.apache.log4j.Logger log =
Logger.getLogger(SearchEngine.class);
+ public static final String EMPTY_SEARCH = "Empty search";
+
/**
* Maximum number of search results at once.
*/
@@ -622,7 +624,7 @@
// check for empty queries
if(searchterm.equals("")){
res = new SearchResults();
- res.setErrorMsg("Empty search");
+ res.setErrorMsg(EMPTY_SEARCH);
return res;
}
--
To view, visit https://gerrit.wikimedia.org/r/60860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c176650fbc92e481960d38c31170fdfcb21f97
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/lucene-search-2
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
