ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhangqi...@apache.org
Subject ranger git commit: RANGER-1692:Similar to RANGER-1540, the Ranger kms should also support the same new feature.
Date Fri, 14 Jul 2017 03:36:35 GMT
Repository: ranger
Updated Branches:
  refs/heads/master 7b61f159f -> 15fd7fa5d


RANGER-1692:Similar to RANGER-1540, the Ranger kms should also support the same new feature.

Signed-off-by: peng.jianhua <peng.jianhua@zte.com.cn>


Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/15fd7fa5
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/15fd7fa5
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/15fd7fa5

Branch: refs/heads/master
Commit: 15fd7fa5d1a734246640e1337d2b2b927dccc486
Parents: 7b61f15
Author: peng.jianhua <peng.jianhua@zte.com.cn>
Authored: Wed Jul 12 09:30:09 2017 -0400
Committer: peng.jianhua <peng.jianhua@zte.com.cn>
Committed: Thu Jul 13 23:33:46 2017 -0400

----------------------------------------------------------------------
 kms/config/kms-webapp/kms-log4j.properties | 4 ++--
 kms/scripts/ranger-kms                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ranger/blob/15fd7fa5/kms/config/kms-webapp/kms-log4j.properties
----------------------------------------------------------------------
diff --git a/kms/config/kms-webapp/kms-log4j.properties b/kms/config/kms-webapp/kms-log4j.properties
index 479b5b4..2ebfe2e 100644
--- a/kms/config/kms-webapp/kms-log4j.properties
+++ b/kms/config/kms-webapp/kms-log4j.properties
@@ -17,14 +17,14 @@
 
 log4j.appender.kms=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.kms.DatePattern='.'yyyy-MM-dd
-log4j.appender.kms.File=${kms.log.dir}/kms.log
+log4j.appender.kms.File=${kms.log.dir}/ranger-kms-${hostname}-${user}.log
 log4j.appender.kms.Append=true
 log4j.appender.kms.layout=org.apache.log4j.PatternLayout
 log4j.appender.kms.layout.ConversionPattern=%d{ISO8601} %-5p %c{1} - %m%n
 
 log4j.appender.kms-audit=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.kms-audit.DatePattern='.'yyyy-MM-dd
-log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit.log
+log4j.appender.kms-audit.File=${kms.log.dir}/kms-audit-${hostname}-${user}.log
 log4j.appender.kms-audit.Append=true
 log4j.appender.kms-audit.layout=org.apache.log4j.PatternLayout
 log4j.appender.kms-audit.layout.ConversionPattern=%d{ISO8601} %m%n

http://git-wip-us.apache.org/repos/asf/ranger/blob/15fd7fa5/kms/scripts/ranger-kms
----------------------------------------------------------------------
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index e902509..c279bc1 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -104,7 +104,7 @@ fi
 
 KMS_CONF_DIR=${RANGER_KMS_EWS_DIR}/webapp/WEB-INF/classes/conf
 SERVER_NAME=rangerkms
-JAVA_OPTS="${JAVA_OPTS} -Dservername=${SERVER_NAME} -Dcatalina.base=${RANGER_KMS_EWS_DIR}
-Dkms.config.dir=${KMS_CONF_DIR} -Dkms.log.dir=${TOMCAT_LOG_DIR} -cp ${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
+JAVA_OPTS="${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME} -Dservername=${SERVER_NAME}
-Dcatalina.base=${RANGER_KMS_EWS_DIR} -Dkms.config.dir=${KMS_CONF_DIR} -Dkms.log.dir=${TOMCAT_LOG_DIR}
-cp ${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH
"
 createRangerKMSPid () {
 	SLEEP_TIME_AFTER_START=5
 	nohup java -D${PROC_NAME} ${JAVA_OPTS} ${START_CLASS_NAME} ${KMS_CONFIG_FILENAME} > ${TOMCAT_LOG_FILE}
2>&1 &


Mime
View raw message