accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/02: Improve log4j lookup (#919)
Date Wed, 27 Feb 2019 00:47:45 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit acd2d9f73b18be9b55e1ea91490a695d4b44ff85
Author: Le Dai <726575153@qq.com>
AuthorDate: Fri Jan 25 09:19:13 2019 +0800

    Improve log4j lookup (#919)
    
    Look for log4j-1.2.17.jar instead of log4j-core-*.jar
---
 assemble/bin/accumulo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 18e0571..71dc471 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -112,7 +112,7 @@ shell)   export ACCUMULO_OPTS="${ACCUMULO_GENERAL_OPTS} ${ACCUMULO_SHELL_OPTS}"
 esac
 
 XML_FILES="${ACCUMULO_CONF_DIR}"
-LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name
'log4j*.jar' -print 2>/dev/null | head -1)
+LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name
'log4j*.jar' -not -name 'log4j-core*.jar' -print 2>/dev/null | head -1)
 SLF4J_JARS="${ACCUMULO_HOME}/lib/slf4j-api.jar:${ACCUMULO_HOME}/lib/slf4j-log4j12.jar"
 
 # The `find` command could fail for environmental reasons or bad configuration


Mime
View raw message