You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2019/06/18 19:02:02 UTC
[atlas] branch master updated: ATLAS-3277 : Add default atlas conf
path in the import-* scripts
This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new 6377989 ATLAS-3277 : Add default atlas conf path in the import-* scripts
6377989 is described below
commit 63779893e14f71233eb3d1f1ebec40db5ee33319
Author: Vishal Suvagia <vi...@apache.org>
AuthorDate: Tue Jun 18 11:26:25 2019 +0530
ATLAS-3277 : Add default atlas conf path in the import-* scripts
---
addons/hbase-bridge/src/bin/import-hbase.sh | 5 +++++
addons/hive-bridge/src/bin/import-hive.sh | 5 +++++
addons/impala-bridge/src/main/resources/import-impala.sh | 5 +++++
addons/kafka-bridge/src/bin/import-kafka.sh | 4 +++-
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh
index 2011eb9..b9c1a4b 100644
--- a/addons/hbase-bridge/src/bin/import-hbase.sh
+++ b/addons/hbase-bridge/src/bin/import-hbase.sh
@@ -55,6 +55,11 @@ for i in "${BASEDIR}/hook/hbase/atlas-hbase-plugin-impl/"*.jar; do
ATLASCPPATH="${ATLASCPPATH}:$i"
done
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+ ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
# log dir for applications
ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-$BASEDIR/logs}"
export ATLAS_LOG_DIR
diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh
index 366ddf1..38ec3be 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -50,6 +50,11 @@ for i in "${BASEDIR}/hook/hive/atlas-hive-plugin-impl/"*.jar; do
ATLASCPPATH="${ATLASCPPATH}:$i"
done
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+ ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
# log dir for applications
ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-$BASEDIR/logs}"
export ATLAS_LOG_DIR
diff --git a/addons/impala-bridge/src/main/resources/import-impala.sh b/addons/impala-bridge/src/main/resources/import-impala.sh
index 5ca8984..b440f2d 100644
--- a/addons/impala-bridge/src/main/resources/import-impala.sh
+++ b/addons/impala-bridge/src/main/resources/import-impala.sh
@@ -81,6 +81,11 @@ for i in "${BASEDIR}/"*.jar; do
ATLASCPPATH="${ATLASCPPATH}:$i"
done
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+ ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
echo "Logging: ${ATLAS_LOG_DIR}/${ATLAS_LOG_FILE}"
echo "Log config: ${LOG_CONFIG}"
diff --git a/addons/kafka-bridge/src/bin/import-kafka.sh b/addons/kafka-bridge/src/bin/import-kafka.sh
index 2af9efd..4bfb8b9 100644
--- a/addons/kafka-bridge/src/bin/import-kafka.sh
+++ b/addons/kafka-bridge/src/bin/import-kafka.sh
@@ -57,7 +57,9 @@ for i in "${BASEDIR}/hook/kafka/atlas-kafka-plugin-impl/"*.jar; do
ATLASCPPATH="${ATLASCPPATH}:$i"
done
-ATLAS_CONF_DIR=/etc/atlas/conf
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+ ATLAS_CONF_DIR=/etc/atlas/conf
+fi
ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
# log dir for applications