Author: thejas
Date: Sat Nov 8 03:22:52 2014
New Revision: 1637506
URL: http://svn.apache.org/r1637506
Log:
HIVE-8772 : zookeeper info logs are always printed from beeline with service
discovery mode (Thejas Nair, reviewed by Vaibhav Gumashta)
Added:
hive/branches/branch-0.14/beeline/src/main/resources/beeline-log4j.properties
Modified:
hive/branches/branch-0.14/bin/ext/beeline.sh
hive/branches/branch-0.14/packaging/src/main/assembly/bin.xml
Added:
hive/branches/branch-0.14/beeline/src/main/resources/beeline-log4j.properties
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/beeline/src/main/resources/beeline-log4j.properties?rev=1637506&view=auto
==============================================================================
---
hive/branches/branch-0.14/beeline/src/main/resources/beeline-log4j.properties
(added)
+++
hive/branches/branch-0.14/beeline/src/main/resources/beeline-log4j.properties
Sat Nov 8 03:22:52 2014
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+log4j.rootLogger=WARN, console
+
+######## console appender ########
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t]: %p
%c{2}: %m%n
+log4j.appender.console.encoding=UTF-8
Modified: hive/branches/branch-0.14/bin/ext/beeline.sh
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/bin/ext/beeline.sh?rev=1637506&r1=1637505&r2=1637506&view=diff
==============================================================================
--- hive/branches/branch-0.14/bin/ext/beeline.sh (original)
+++ hive/branches/branch-0.14/bin/ext/beeline.sh Sat Nov 8 03:22:52 2014
@@ -25,7 +25,8 @@ beeline () {
superCsvJarPath=`ls ${HIVE_LIB}/super-csv-*.jar`
jlineJarPath=`ls ${HIVE_LIB}/jline-*.jar`
jdbcStandaloneJarPath=`ls ${HIVE_LIB}/hive-jdbc-*-standalone.jar`
- export
HADOOP_CLASSPATH=${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath}
+ export
HADOOP_CLASSPATH=${HIVE_CONF_DIR}:${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath}
+ export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS
-Dlog4j.configuration=beeline-log4j.properties "
exec $HADOOP jar ${beelineJarPath} $CLASS $HIVE_OPTS "$@"
}
Modified: hive/branches/branch-0.14/packaging/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.14/packaging/src/main/assembly/bin.xml?rev=1637506&r1=1637505&r2=1637506&view=diff
==============================================================================
--- hive/branches/branch-0.14/packaging/src/main/assembly/bin.xml (original)
+++ hive/branches/branch-0.14/packaging/src/main/assembly/bin.xml Sat Nov 8
03:22:52 2014
@@ -328,6 +328,11 @@
<destName>hive-exec-log4j.properties.template</destName>
</file>
<file>
+
<source>${project.parent.basedir}/beeline/src/main/resources/beeline-log4j.properties</source>
+ <outputDirectory>conf</outputDirectory>
+ <destName>beeline-log4j.properties.template</destName>
+ </file>
+ <file>
<source>${project.parent.basedir}/hcatalog/README.txt</source>
<outputDirectory>hcatalog/share/doc/hcatalog</outputDirectory>
</file>
