Repository: metron Updated Branches: refs/heads/master 39e22fa1b -> 0eeb3a379
METRON-1593 Setting Metron rest additional classpath removes HBase and Hadoop configs from classpath (merrimanr) closes apache/metron#1044 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/0eeb3a37 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/0eeb3a37 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/0eeb3a37 Branch: refs/heads/master Commit: 0eeb3a3794b471b029aee2f6fb936206168c0486 Parents: 39e22fa Author: merrimanr <[email protected]> Authored: Mon Jun 4 08:54:13 2018 -0500 Committer: merrimanr <[email protected]> Committed: Mon Jun 4 08:54:13 2018 -0500 ---------------------------------------------------------------------- metron-interface/metron-rest/src/main/scripts/metron-rest.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/0eeb3a37/metron-interface/metron-rest/src/main/scripts/metron-rest.sh ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh index 420c539..2c7c75b 100644 --- a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh +++ b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh @@ -49,7 +49,10 @@ if [ -f "$METRON_SYSCONFIG" ]; then . "$METRON_SYSCONFIG" fi -METRON_REST_CLASSPATH="${METRON_REST_CLASSPATH:-$HADOOP_CONF_DIR:${HBASE_HOME}/conf}" +if [ ${METRON_REST_CLASSPATH} ]; then + METRON_REST_CLASSPATH+=":" +fi +METRON_REST_CLASSPATH+="$HADOOP_CONF_DIR:${HBASE_HOME}/conf" # Use a custom REST jar if provided, else pull the metron-rest jar rest_jar_pattern="${METRON_HOME}/lib/metron-rest*.jar"
