Skip to content

Commit

Permalink
reduced log level to make travis work
Browse files Browse the repository at this point in the history
  • Loading branch information
salyh committed Dec 11, 2013
1 parent e4503c7 commit 8adddae
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
Expand Up @@ -376,7 +376,7 @@ protected void doStart() throws ElasticSearchException {
{
logger.info("Using SSL");

System.setProperty("javax.net.debug", "ssl");
//System.setProperty("javax.net.debug", "ssl");
httpConnector.setAttribute("SSLEnabled", "true");
httpConnector.setSecure(true);
httpConnector.setScheme("https");
Expand Down Expand Up @@ -518,7 +518,7 @@ protected void doStart() throws ElasticSearchException {

} else if ("spnegoad".equalsIgnoreCase(kerberosMode)) {

System.setProperty("sun.security.krb5.debug", "true"); // TODO
//System.setProperty("sun.security.krb5.debug", "true"); // TODO
// switch
// off

Expand Down
18 changes: 9 additions & 9 deletions src/test/resources/log4j.properties
@@ -1,18 +1,18 @@
log4j.rootLogger=WARN, out
log4j.rootLogger=ERROR, out

log4j.appender.out=org.apache.log4j.ConsoleAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.conversionPattern=[%d{HH:mm:ss}][%-5p] %c - %m%n

log4j.logger.org.apache.catalina.startup=ERROR
log4j.logger.org.apache.catalina.loader.WebappClassLoader=FATAL
log4j.logger.org.elasticsearch.plugins.security=ALL
log4j.logger.net.sf.michaelo=ALL
log4j.logger.waffle=INFO
#log4j.logger.org.elasticsearch.plugins.security=ALL
#log4j.logger.net.sf.michaelo=ALL
#log4j.logger.waffle=INFO


log4j.logger.org.apache.http.wire=ALL
log4j.logger.org.apache.catalina.authenticator=ALL
log4j.logger.org.apache.catalina.realm=ALL
log4j.logger.org.apache.catalina.core.ContainerBase=ALL
log4j.logger.org.apache.directory=WARN
#log4j.logger.org.apache.http.wire=ALL
#log4j.logger.org.apache.catalina.authenticator=ALL
#log4j.logger.org.apache.catalina.realm=ALL
#log4j.logger.org.apache.catalina.core.ContainerBase=ALL
#log4j.logger.org.apache.directory=WARN
4 changes: 0 additions & 4 deletions travisscripts/travis-before-install.sh
@@ -1,7 +1,3 @@
#!/bin/sh

echo start-travis-before-install
sudo sed -i 's/localhost.localdomain//' /etc/hosts
sudo cat /etc/hosts
sudo apt-get update
echo end-travis-before-install

0 comments on commit 8adddae

Please sign in to comment.