r7008 - branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token

[ssmiweve]

Author: ssmiweve
Date: 2008-12-02 11:16:44 +0100 (Tue, 02 Dec 2008)
New Revision: 7008

Modified:
   
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/FastQueryMatchingEvaluatorFactory.java
   
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrEvaluatorFactory.java
Log:
avoid timeouts in debug environments

Modified: 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/FastQueryMatchingEvaluatorFactory.java
===================================================================
--- 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/FastQueryMatchingEvaluatorFactory.java
       2008-12-02 08:49:22 UTC (rev 7007)
+++ 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/FastQueryMatchingEvaluatorFactory.java
       2008-12-02 10:16:44 UTC (rev 7008)
@@ -28,6 +28,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import no.sesat.search.site.SiteKeyedFactoryInstantiationException;
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 
@@ -111,8 +112,14 @@
     private VeryFastTokenEvaluator getFastEvaluator() throws 
EvaluationException {
 
         try {
-            fastEvaluatorCreator.get(1000, TimeUnit.MILLISECONDS);
+            // when the root logger is set to DEBUG do not limit connection 
times
+            if(Logger.getRootLogger().getLevel().isGreaterOrEqual(Level.INFO)){
 
+                fastEvaluatorCreator.get(1000, TimeUnit.MILLISECONDS);
+            }else{
+                fastEvaluatorCreator.get();
+            }
+
         } catch (InterruptedException ex) {
             LOG.error(ERR_FAST_EVALUATOR_CREATOR_INTERRUPTED, ex);
             throw new 
EvaluationException(ERR_FAILED_CONSTRUCTING_FAST_EVALUATOR, ex);

Modified: 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrEvaluatorFactory.java
===================================================================
--- 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrEvaluatorFactory.java
    2008-12-02 08:49:22 UTC (rev 7007)
+++ 
branches/2.18/generic.sesam/query-evaluation/src/main/java/no/sesat/search/query/token/SolrEvaluatorFactory.java
    2008-12-02 10:16:44 UTC (rev 7008)
@@ -37,6 +37,7 @@
 import no.sesat.search.site.SiteKeyedFactoryInstantiationException;
 import no.sesat.search.site.config.DocumentLoader;
 import no.sesat.search.site.config.SiteConfiguration;
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 import org.apache.solr.client.solrj.SolrServer;
@@ -282,8 +283,15 @@
     private SolrTokenEvaluator getSolrEvaluator() throws EvaluationException {
 
         try {
-            solrEvaluatorCreator.get(1000, TimeUnit.MILLISECONDS);
 
+            // when the root logger is set to DEBUG do not limit connection 
times
+            if(Logger.getRootLogger().getLevel().isGreaterOrEqual(Level.INFO)){
+
+                solrEvaluatorCreator.get(1000, TimeUnit.MILLISECONDS);
+            }else{
+                solrEvaluatorCreator.get();
+            }
+
         } catch (InterruptedException ex) {
             LOG.error(ex.getMessage(), ex);
             throw new EvaluationException(ex.getMessage(), ex);

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits