This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch ranger-2.0 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 1b93570cdadafb24065340b67fde32fc8ca0cbbf Author: Nikhil P <[email protected]> AuthorDate: Wed Jul 31 16:37:45 2019 +0530 RANGER-2523 : Ranger Admin debug config improvement Signed-off-by: Pradeep <[email protected]> --- embeddedwebserver/scripts/ranger-admin-services.sh | 2 +- security-admin/src/main/webapp/WEB-INF/web.xml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/embeddedwebserver/scripts/ranger-admin-services.sh b/embeddedwebserver/scripts/ranger-admin-services.sh index 8f148a7..0bc06e1 100755 --- a/embeddedwebserver/scripts/ranger-admin-services.sh +++ b/embeddedwebserver/scripts/ranger-admin-services.sh @@ -85,7 +85,7 @@ fi SERVER_NAME=rangeradmin start() { SLEEP_TIME_AFTER_START=5 - nohup java -Dproc_rangeradmin ${JAVA_OPTS} -Duser=${USER} -Dhostname=${HOSTNAME} ${DB_SSL_PARAM} -Dservername=${SERVER_NAME} -Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH" org.apache.ranger.server.tomcat.EmbeddedServer > ${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 & + nohup java -Dproc_rangeradmin ${JAVA_OPTS} -Dlog4j.configuration=file:${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/log4j.properties -Duser=${USER} -Dhostname=${HOSTNAME} ${DB_SSL_PARAM} -Dservername=${SERVER_NAME} -Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH" org.apache.ranger [...] VALUE_OF_PID=$! echo "Starting Apache Ranger Admin Service" sleep $SLEEP_TIME_AFTER_START diff --git a/security-admin/src/main/webapp/WEB-INF/web.xml b/security-admin/src/main/webapp/WEB-INF/web.xml index 806a066..c788268 100644 --- a/security-admin/src/main/webapp/WEB-INF/web.xml +++ b/security-admin/src/main/webapp/WEB-INF/web.xml @@ -27,10 +27,6 @@ WEB-INF/classes/conf/security-applicationContext.xml META-INF/scheduler-applicationContext.xml</param-value> </context-param> - <context-param> - <param-name>log4jConfigLocation</param-name> - <param-value>/WEB-INF/log4j.properties</param-value> - </context-param> <listener> <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> </listener>
