Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CD889200B33 for ; Wed, 15 Jun 2016 00:53:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CC129160A56; Tue, 14 Jun 2016 22:53:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1D212160A06 for ; Wed, 15 Jun 2016 00:53:40 +0200 (CEST) Received: (qmail 22046 invoked by uid 500); 14 Jun 2016 22:53:40 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 22033 invoked by uid 99); 14 Jun 2016 22:53:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2016 22:53:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2423DDFFF8; Tue, 14 Jun 2016 22:53:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prasanthj@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-14010: parquet-logging.properties from HIVE_CONF_DIR should be used when available (Prasanth Jayachandran reviewed by Ashutosh Chauhan) Date: Tue, 14 Jun 2016 22:53:40 +0000 (UTC) archived-at: Tue, 14 Jun 2016 22:53:42 -0000 Repository: hive Updated Branches: refs/heads/branch-1 1e2e68816 -> 370f5d799 HIVE-14010: parquet-logging.properties from HIVE_CONF_DIR should be used when available (Prasanth Jayachandran reviewed by Ashutosh Chauhan) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/370f5d79 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/370f5d79 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/370f5d79 Branch: refs/heads/branch-1 Commit: 370f5d799780404b36454a16d42e7d3142e9dc78 Parents: 1e2e688 Author: Prasanth Jayachandran Authored: Tue Jun 14 15:51:05 2016 -0700 Committer: Prasanth Jayachandran Committed: Tue Jun 14 15:53:30 2016 -0700 ---------------------------------------------------------------------- bin/hive | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/370f5d79/bin/hive ---------------------------------------------------------------------- diff --git a/bin/hive b/bin/hive index ed90716..d411914 100755 --- a/bin/hive +++ b/bin/hive @@ -293,8 +293,11 @@ for j in $SERVICE_LIST ; do fi done -# to initialize logging for all services -export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djava.util.logging.config.file=$bin/../conf/parquet-logging.properties " +if [ -f "${HIVE_CONF_DIR}/parquet-logging.properties" ]; then + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djava.util.logging.config.file=${HIVE_CONF_DIR}/parquet-logging.properties " +else + export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=hive-log4j2.properties -Djava.util.logging.config.file=$bin/../conf/parquet-logging.properties " +fi if [ "$TORUN" = "" ] ; then echo "Service $SERVICE not found"