Permalink
Browse files

Merge pull request #4 from jvelo/multi_java_processes

Support running other java processes together with XWiki
  • Loading branch information...
2 parents 7597404 + 1742b2a commit 0daa47b844d2328b0691386a89a74da9d8fc5511 astancu committed Aug 20, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 var/lib/xinit/functions
@@ -5,7 +5,7 @@ start_tomcat ()
{
log "INFO" "Starting Tomcat Server ..."
- if [[ -z "`pidof ${TOMCAT_PROCESS_NAME}`" ]]; then
+ if [[ -z "`ps auxww | grep ${TOMCAT_PROCESS_NAME} | grep ${TOMCAT_HOME} | awk '{print $2}'`" ]]; then
if [[ -e "$CATALINA_PID" ]]; then
@@ -60,7 +60,7 @@ stop_tomcat ()
TOMCAT_PID="`cat $CATALINA_PID`"
else
- TOMCAT_PID="`pidof ${TOMCAT_PROCESS_NAME}`"
+ TOMCAT_PID="`ps auxww | grep ${TOMCAT_PROCESS_NAME} | grep ${TOMCAT_HOME} | awk '{print $2}'`"
fi
if [[ -n "$TOMCAT_PID" ]]; then

0 comments on commit 0daa47b

Please sign in to comment.