This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new e157378524e HBASE-27244 bin/hbase still use slf4j-log4j while reload4j
in place (#4652)
e157378524e is described below
commit e157378524e1c7f84006355beab71f5b8110a7f2
Author: alexdongli0829 <[email protected]>
AuthorDate: Wed Aug 10 18:13:09 2022 +1000
HBASE-27244 bin/hbase still use slf4j-log4j while reload4j in place (#4652)
Co-authored-by: Dong Li <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
---
bin/hbase | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/hbase b/bin/hbase
index d306ed069d6..3c8f80bf4e2 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -304,7 +304,7 @@ fi
for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do
if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \
[ "${f}" != "htrace-core.jar$" ] && \
- [[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then
+ [[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then
CLASSPATH="${CLASSPATH}:${f}"
fi
done
@@ -641,7 +641,7 @@ elif [ "$COMMAND" = "mapredcp" ] ; then
for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do
if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \
[ "${f}" != "htrace-core.jar$" ] && \
- [[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then
+ [[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then
echo -n ":${f}"
fi
done
@@ -780,7 +780,7 @@ fi
HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX"
# by now if we're running a command it means we need logging
-for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-log4j*.jar; do
+for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-reload4j*.jar; do
if [ -f "${f}" ]; then
CLASSPATH="${CLASSPATH}:${f}"
break
