Author: ssmiweve
Date: 2008-11-27 11:13:32 +0100 (Thu, 27 Nov 2008)
New Revision: 6992
Modified:
branches/2.18/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/SolrSearchCommand.java
Log:
allow configuration for solr query's timeout setting
Modified:
branches/2.18/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
===================================================================
---
branches/2.18/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
2008-11-27 09:50:27 UTC (rev 6991)
+++
branches/2.18/generic.sesam/search-command-config/src/main/java/no/sesat/search/mode/config/SolrCommandConfig.java
2008-11-27 10:13:32 UTC (rev 6992)
@@ -46,6 +46,8 @@
private final Map<String,String> sort = new HashMap<String,String>();
+ private Integer timeout = Integer.MAX_VALUE;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -117,6 +119,22 @@
}
}
+ /**
+ *
+ * @param integer
+ */
+ public void setTimeout(final Integer integer){
+ timeout = integer;
+ }
+
+ /** @see #setTimeout(java.lang.Integer)
+ *
+ * @return
+ */
+ public int getTimeout(){
+ return timeout;
+ }
+
@Override
public SearchConfiguration readSearchConfiguration(
final Element element,
Modified:
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/SolrSearchCommand.java
===================================================================
---
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/SolrSearchCommand.java
2008-11-27 09:50:27 UTC (rev 6991)
+++
branches/2.18/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/SolrSearchCommand.java
2008-11-27 10:13:32 UTC (rev 6992)
@@ -30,6 +30,7 @@
import no.sesat.search.result.ResultItem;
import no.sesat.search.result.ResultList;
import no.sesat.search.site.config.SiteConfiguration;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
@@ -102,6 +103,11 @@
.setRows(getSearchConfiguration().getResultsToReturn())
.setFields(getSearchConfiguration().getResultFieldMap().keySet().toArray(new
String[]{}));
+ // when the root logger is set to DEBUG do not limit connection
times
+ if(Logger.getRootLogger().getLevel().isGreaterOrEqual(Level.INFO)){
+ query.setTimeAllowed(getSearchConfiguration().getTimeout());
+ }
+
final Map<String,String> sortMap =
getSearchConfiguration().getSortMap();
for(Map.Entry<String,String> entry : sortMap.entrySet()){
final SolrQuery.ORDER order =
SolrQuery.ORDER.valueOf(entry.getValue());
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
