Hi Dejan, On 17 January 2011 14:54, Dejan Muhamedagic <[email protected]> wrote: > Hi Brett, > > Long time.
Indeed it is - thank you for the reminder! This one simply uses here documents for start/stop operations. -- Best Regards, Brett Delle Grazie
From 1c0a2ef05bfbde930962befd99799d4f6a318231 Mon Sep 17 00:00:00 2001 From: Brett Delle Grazie <[email protected]> Date: Mon, 17 Jan 2011 22:09:44 +0000 Subject: [PATCH] Low: tomcat: Use here-documents to simplify start/stop operations --- heartbeat/tomcat | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/heartbeat/tomcat b/heartbeat/tomcat index 689edc7..671ba82 100755 --- a/heartbeat/tomcat +++ b/heartbeat/tomcat @@ -146,14 +146,14 @@ start_tomcat() "$CATALINA_HOME/bin/catalina.sh" start $TOMCAT_START_OPTS \ >> "$TOMCAT_CONSOLE" 2>&1 & else - su - -s /bin/sh "$RESOURCE_TOMCAT_USER" \ - -c "export JAVA_HOME=${OCF_RESKEY_java_home};\ - export JAVA_OPTS=-Dname=${TOMCAT_NAME};\ - export CATALINA_HOME=${OCF_RESKEY_catalina_home};\ - export CATALINA_PID=${OCF_RESKEY_catalina_pid};\ - export CATALINA_OPTS=\"${OCF_RESKEY_catalina_opts}\";\ - $CATALINA_HOME/bin/catalina.sh start ${OCF_RESKEY_tomcat_start_opts}" \ - >> "$TOMCAT_CONSOLE" 2>&1 & + cat<<-END_TOMCAT_START | su - -s /bin/sh "$RESOURCE_TOMCAT_USER" >> "$TOMCAT_CONSOLE" 2>&1 & + export JAVA_HOME=${OCF_RESKEY_java_home} + export JAVA_OPTS=-Dname=${TOMCAT_NAME} + export CATALINA_HOME=${OCF_RESKEY_catalina_home} + export CATALINA_PID=${OCF_RESKEY_catalina_pid} + export CATALINA_OPTS=\"${OCF_RESKEY_catalina_opts}\" + $CATALINA_HOME/bin/catalina.sh start ${OCF_RESKEY_tomcat_start_opts} +END_TOMCAT_START fi while true; do @@ -181,13 +181,13 @@ stop_tomcat() >> "$TOMCAT_CONSOLE" 2>&1 & eval $tomcat_stop_cmd >> "$TOMCAT_CONSOLE" 2>&1 else - su - -s /bin/sh "$RESOURCE_TOMCAT_USER" \ - -c "export JAVA_HOME=${OCF_RESKEY_java_home};\ - export JAVA_OPTS=-Dname=${TOMCAT_NAME};\ - export CATALINA_HOME=${OCF_RESKEY_catalina_home};\ - export CATALINA_PID=${OCF_RESKEY_catalina_pid};\ - $CATALINA_HOME/bin/catalina.sh stop" \ - >> "$TOMCAT_CONSOLE" 2>&1 & + cat<<-END_TOMCAT_STOP | su - -s /bin/sh "$RESOURCE_TOMCAT_USER" >> "$TOMCAT_CONSOLE" 2>&1 & + export JAVA_HOME=${OCF_RESKEY_java_home} + export JAVA_OPTS=-Dname=${TOMCAT_NAME} + export CATALINA_HOME=${OCF_RESKEY_catalina_home} + export CATALINA_PID=${OCF_RESKEY_catalina_pid} + $CATALINA_HOME/bin/catalina.sh stop +END_TOMCAT_STOP fi lapse_sec=0 -- 1.7.1
_______________________________________________ Linux-HA mailing list [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha See also: http://linux-ha.org/ReportingProblems
