hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
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 GMT
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 <prasanthj@apache.org>
Authored: Tue Jun 14 15:51:05 2016 -0700
Committer: Prasanth Jayachandran <prasanthj@apache.org>
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"


Mime
View raw message