Skip to content

Commit e157378

Browse files
alexdongli0829Dong Li
andauthored
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]>
1 parent ae8652c commit e157378

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bin/hbase

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ fi
304304
for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do
305305
if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \
306306
[ "${f}" != "htrace-core.jar$" ] && \
307-
[[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then
307+
[[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then
308308
CLASSPATH="${CLASSPATH}:${f}"
309309
fi
310310
done
@@ -641,7 +641,7 @@ elif [ "$COMMAND" = "mapredcp" ] ; then
641641
for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do
642642
if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \
643643
[ "${f}" != "htrace-core.jar$" ] && \
644-
[[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then
644+
[[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then
645645
echo -n ":${f}"
646646
fi
647647
done
@@ -780,7 +780,7 @@ fi
780780

781781
HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX"
782782
# by now if we're running a command it means we need logging
783-
for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-log4j*.jar; do
783+
for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-reload4j*.jar; do
784784
if [ -f "${f}" ]; then
785785
CLASSPATH="${CLASSPATH}:${f}"
786786
break

0 commit comments

Comments
 (0)