Skip to content

Commit

Permalink
Allow logback to be configured from solr home logback.xml, set solr o…
Browse files Browse the repository at this point in the history
…utput to WARN
  • Loading branch information
mguymon committed Sep 17, 2012
1 parent 7ca2e7b commit 05c78b0
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/main/java/com/tobedevoured/solrsail/JettyServer.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;




import com.tobedevoured.command.LogUtil;
import com.tobedevoured.command.Runner; import com.tobedevoured.command.Runner;
import com.tobedevoured.command.annotation.ByYourCommand; import com.tobedevoured.command.annotation.ByYourCommand;
import com.tobedevoured.command.annotation.Command; import com.tobedevoured.command.annotation.Command;
Expand Down Expand Up @@ -90,6 +91,11 @@ public void start(boolean join) throws Exception {


System.setProperty("org.apache.jasper.compiler.disablejsr199", "true" ); System.setProperty("org.apache.jasper.compiler.disablejsr199", "true" );


File logbackConfig = new File( getSolrHome() + File.separator + "logback.xml" );
if ( logbackConfig.exists() ) {
LogUtil.configureFromFile( logbackConfig );
}

server = new Server(getPort()); server = new Server(getPort());


String webDir = JettyServer.class.getClassLoader().getResource("webapp").toExternalForm(); String webDir = JettyServer.class.getClassLoader().getResource("webapp").toExternalForm();
Expand Down

0 comments on commit 05c78b0

Please sign in to comment.