From 92b193f3b0df7468f0b6f839bd2ebd19c40ae862 Mon Sep 17 00:00:00 2001 From: wenwj0 <36262341+wenwj0@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:23:27 +0800 Subject: [PATCH] Revert "HBASE-26854 Shell startup logs a bunch of noise (#4469)" This reverts commit de9776d71434f7af9618a2190aa09a01a5053ad0. --- hbase-shell/src/main/ruby/jar-bootstrap.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hbase-shell/src/main/ruby/jar-bootstrap.rb b/hbase-shell/src/main/ruby/jar-bootstrap.rb index 3f0e650947cf..917817fc59f9 100644 --- a/hbase-shell/src/main/ruby/jar-bootstrap.rb +++ b/hbase-shell/src/main/ruby/jar-bootstrap.rb @@ -104,7 +104,7 @@ def add_to_configuration(c, arg) opts.ordering = GetoptLong::REQUIRE_ORDER script2run = nil -log_level = org.apache.logging.log4j.Level::ERROR +log_level = org.apache.log4j.Level::ERROR @shell_debug = false interactive = true full_backtrace = false @@ -118,7 +118,7 @@ def add_to_configuration(c, arg) when D_ARG conf_from_cli = add_to_configuration(conf_from_cli, arg) when '--debug' - log_level = org.apache.logging.log4j.Level::DEBUG + log_level = org.apache.log4j.Level::DEBUG full_backtrace = true @shell_debug = true puts 'Setting DEBUG log level...' @@ -138,8 +138,8 @@ def add_to_configuration(c, arg) ARGV.unshift('-d') if @shell_debug # Set logging level to avoid verboseness -org.apache.logging.log4j.core.config.Configurator.setAllLevels('org.apache.zookeeper', log_level) -org.apache.logging.log4j.core.config.Configurator.setAllLevels('org.apache.hadoop', log_level) +org.apache.log4j.Logger.getLogger('org.apache.zookeeper').setLevel(log_level) +org.apache.log4j.Logger.getLogger('org.apache.hadoop.hbase').setLevel(log_level) # Require HBase now after setting log levels require 'hbase_constants' @@ -165,14 +165,14 @@ def debug if @shell_debug @shell_debug = false conf.back_trace_limit = 0 - log_level = org.apache.logging.log4j.Level::ERROR + log_level = org.apache.log4j.Level::ERROR else @shell_debug = true conf.back_trace_limit = 100 - log_level = org.apache.logging.log4j.Level::DEBUG + log_level = org.apache.log4j.Level::DEBUG end - org.apache.logging.log4j.core.config.Configurator.setAllLevels('org.apache.zookeeper', log_level) - org.apache.logging.log4j.core.config.Configurator.setAllLevels('org.apache.hadoop', log_level) + org.apache.log4j.Logger.getLogger('org.apache.zookeeper').setLevel(log_level) + org.apache.log4j.Logger.getLogger('org.apache.hadoop.hbase').setLevel(log_level) debug? end