You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jz...@apache.org on 2017/03/02 00:35:39 UTC
hadoop git commit: HADOOP-14131. kms.sh creates bogus dir for tomcat
logs. Contributed by John Zhuge.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ff08f54f4 -> 133857ba0
HADOOP-14131. kms.sh creates bogus dir for tomcat logs. Contributed by John Zhuge.
Change-Id: I444e10318eb64dcd4c0416b985d12049c72e8943
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/133857ba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/133857ba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/133857ba
Branch: refs/heads/branch-2
Commit: 133857ba049e4b74579952141b6b03cad37df2a0
Parents: ff08f54
Author: John Zhuge <jz...@cloudera.com>
Authored: Wed Mar 1 16:31:34 2017 -0800
Committer: John Zhuge <jz...@cloudera.com>
Committed: Wed Mar 1 16:31:34 2017 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/133857ba/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh b/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
index 9bfad42..49c1fb1 100644
--- a/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
+++ b/hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
@@ -59,7 +59,8 @@ CATALINA_OPTS_DISP=`echo ${CATALINA_OPTS} | sed -e 's/trustStorePassword=[^ ]*/t
print "Using CATALINA_OPTS: ${CATALINA_OPTS_DISP}"
catalina_opts="-Dproc_kms"
-catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}";
+catalina_opts="${catalina_opts} -Dkms.log.dir=${KMS_LOG}"
+catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}"
print "Adding to CATALINA_OPTS: ${catalina_opts}"
print "Found KMS_SSL_KEYSTORE_PASS: `echo ${KMS_SSL_KEYSTORE_PASS} | sed 's/./*/g'`"
@@ -84,7 +85,6 @@ if [[ "${1}" = "start" || "${1}" = "run" ]]; then
catalina_init_properties
catalina_set_property "kms.home.dir" "${KMS_HOME}"
catalina_set_property "kms.config.dir" "${KMS_CONFIG}"
- catalina_set_property "kms.log.dir" "${KMS_LOG}"
catalina_set_property "kms.temp.dir" "${KMS_TEMP}"
catalina_set_property "kms.admin.port" "${KMS_ADMIN_PORT}"
catalina_set_property "kms.http.port" "${KMS_HTTP_PORT}"
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org