diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2009-07-29 13:33:19 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2009-07-29 13:33:19 +0000 |
| commit | 0cd198a0b890982d1aa2429467708d39ad7660a7 (patch) | |
| tree | efa1b9c1cd61b91f495f7861fed7fb29c0367129 /www/tomcat7/files/tomcat6.sh.in | |
| parent | 5d91491fcb6497cc38571507beb754a5c402fe76 (diff) | |
| download | ports-0cd198a0b890982d1aa2429467708d39ad7660a7.tar.gz ports-0cd198a0b890982d1aa2429467708d39ad7660a7.zip | |
Notes
Diffstat (limited to 'www/tomcat7/files/tomcat6.sh.in')
| -rw-r--r-- | www/tomcat7/files/tomcat6.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/tomcat7/files/tomcat6.sh.in b/www/tomcat7/files/tomcat6.sh.in index 15c8fd53658e..66486830b61f 100644 --- a/www/tomcat7/files/tomcat6.sh.in +++ b/www/tomcat7/files/tomcat6.sh.in @@ -73,7 +73,7 @@ tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:- name="tomcat%%TOMCAT_VERSION%%" rcvar=`set_rcvar` -pidfile="%%PID_FILE%%" +pidfile="/var/run/%%APP_SHORTNAME%%.pid" load_rc_config "${name}" @@ -109,7 +109,7 @@ log_args=">> ${tomcat%%TOMCAT_VERSION%%_stdout_log} \ if [ -f $pidfile ]; then read rc_pid junk < $pidfile if [ ! -z "$rc_pid" ]; then - procname=`ps -o ucomm= $rc_pid` + procname=`ps -o command= -p $rc_pid | cut -f1 -d ' '` fi fi if [ -z "$procname" ]; then @@ -147,7 +147,7 @@ tomcat%%TOMCAT_VERSION%%_stop() { ${java_command} stop tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} ${rc_pid} kill -KILL ${rc_pid} 2> /dev/null && echo "Killed." - echo -n > ${pidfile} + rm -f ${pidfile} } tomcat_wait_max_for_pid() { |