trinidad_init_services 1.2.3 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eba0572bd277127f8bd63d447aa351dc206931e8
+  data.tar.gz: 93784996ee1140fa3fd1a1d69f39877079a9d77c
+SHA512:
+  metadata.gz: 2b2f768bf987bd52589a4bcc0f00fbfdf1f4310c47405eefb938f2557e7c5bf187318a5136f4f890254f6040be05392d5a95b5e8864b50d60d9cc8c76ba43986
+  data.tar.gz: 82739292c9a61af042a06168954deb467f9836b959e8f0ba57b1afa38cc5cc42ed14e2b43f020fb7cebd3a6480f7e69e9f245b1d9c78a52357e403cbe0e1a7d6

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+jdk:
+  - openjdk6
+  - oraclejdk7
+  - oraclejdk8
+rvm:
+  - jruby
+before_install:
+  - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
+env:
+  - JRUBY_OPTS="--1.8 $JRUBY_OPTS" TRINIDAD_VERSION="~> 1.4.6"
+  - JRUBY_OPTS="$JRUBY_OPTS"

data/CHANGELOG.md

@@ -0,0 +1,123 @@
+## 1.3.0 (2014-07-03)
+
+* `--no-ask` is now known as `--know`
+* (portable) shell sub-string matching without echo
+* do a service update when already installed (on windoze) + better removal
+* include a service trinidad_init_service.log file of commands executed
+* configure out redirection as well as pid file (+ log path) on windoze
+* fix uninstall failing (alwo try supporting RH standarts)
+* revised service id/name/desc configuration (to be 'more' similar on platforms)
+* improved java_home detection and error message
+* align with boot tag script conventions  - avoid insserv: warning (#31)
+* support for some detecting of JAVA_OPTS and calculating JVM memory requirements
+* allow to detect 2.x ruby compat mode (JRuby >= 1.7)
+* better init.d compat with other/older shells + support customizing JAVA_OPTS
+* refactor init.d script - make sure -cwd $BASE_DIR happens + warn on missing base
+* do not ask for ruby compat version - simply use the current one
+* refactor log_file to out_file ... as it might be confusing
+* decrease default stack-size 1536k should be still a very 'pessimistic' guess
+* allow to configure jsvc's -wait and -keepstdin in generated init.d script
+* better compatibility for upcoming Trinidad 1.5
+* update commons-daemon to 1.0.15
+
+## 1.2.3 (2013-09-10)
+
+* detect if the process is still actually running
+  to handle starting the service after the machine was halted and restarted (#36)
+* update to jruby-jsvc 0.5.1
+* update to commons-daemon 1.0.13
+* a better running PID ps check (fix `ps -p` without grep)
+
+## 1.2.2 (2012-10-23)
+
+* remove JRUBY_OPTS from init.d script (#28)
+* latest jruby binary compatibility
+  - JAVA_MEM accepted in (and converted to) -Xmx format
+  - JAVA_STACK accepted in (and converted to) -Xss format
+  - added JAVA_MEM_MIN (-Xms format)
+
+## 1.2.1 (2012-09-06)
+
+* publicize ask= and say= (used from trinidad_init_service) (#25)
+
+## 1.2.0 (2012-09-03)
+
+* add an --uninstall option (requested on Windows) (#22)
+* make ruby binary behave like a "gemtleman" see `trinidad_init_service --help`
+* added possibility to specify service id and service description under windows
+* ensure $PIDFILE_DIR exists and $RUN_USER has access
+
+## 1.1.6 (2012-05-18)
+
+* fix windows option formatting with prunsrv's arguments
+* detect prunsrv.exe on windows PATH
+
+## 1.1.5 (2012-03-06)
+
+* not working arch detection on Windows + missing 32-bit prunsrv.exe
+
+## 1.1.4 (2012-03-01)
+
+* JSVC sources packaged along the gem and compiled on demand (#6)
+* improve JRuby's native path detection in generated init.d script
+* make gem usable with bundler :git => paths
+
+## 1.1.3 (2012-02-20)
+
+* do not ask for a path with $RUN_USER
+
+## 1.1.2 (2012-01-17)
+
+* revert previous -errfile fix
+* use a better procfile name (#10)
+
+## 1.1.1 (2012-01-16)
+
+* issue on with -errfile &1 being misinterpreted (#8)
+
+## 1.1.0 (2012-01-04)
+
+* fix bug that didn't allow to create several services with different ids.
+* allow to provide a configuration file to load the options from.
+
+## 1.1.0.pre (2011-09-30)
+
+* load prunsrv on Windows according with the architecture
+
+## 1.0.0 (2011-06-11)
+
+* rebranded gem
+* fix shutdown compatibility errors with Trinidad 1.2.2 and above
+
+## 0.4.2 (2011-05-17)
+
+* fix several minor bugs
+
+## 0.4.1 (2011-01-18)
+
+* ensure the unix script is executable by default
+
+## 0.4.0 (2011-01-13)
+
+* generate Windows service.
+
+## 0.3.2
+
+* remove profile.jar from init script since it's no more bundled with JRuby
+
+## 0.3.1
+
+* use absolute path for configuration options
+* start Trinidad from the application path
+
+## 0.3.0
+
+* remove init script extension
+
+## 0.2.0
+
+* fix several bugs
+
+## 0.1.0
+
+* initial release

data/Gemfile

@@ -1,2 +1,8 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+
+if version = ENV['TRINIDAD_VERSION']
+  gem 'trinidad', version, :require => nil
+end
+
+gem 'rake', '~> 10.3', :require => nil

data/LICENSE

@@ -1,6 +1,6 @@
 == Trinidad
 
-Copyright (c) 2012 Team Trinidad and contributors http://github.com/trinidad
+Copyright (c) 2014 Team Trinidad and contributors http://github.com/trinidad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,13 +2,14 @@
 
 Init services based on Apache [Commons Daemon](http://commons.apache.org/daemon/)
 and [jruby-jsvc](https://github.com/nicobrevin/jruby-jsvc).
+
 Allows you to run Trinidad as an OS daemon, works on Unix and Windows systems.
 
 ## Installation
 
-    $ jruby -S gem install trinidad_init_services
+    $ gem install trinidad_init_services
 
-When the gem is installed the user must launch the installation process:
+When the gem is installed the you launch the installation process :
 
     $ jruby -S trinidad_init_service
 
@@ -16,40 +17,45 @@ This installer guides you through the configuration process and generates a
 init.d script if you are on a Unix system or creates the service if you are
 on a Windows box.
 
-You can optionally provide a YAML configuration file with defaults specified 
+You can optionally provide a YAML configuration file with defaults specified
 for the `trinidad_init_service` command. An example configuration file :
 
-    app_path: "/home/trinidad/myapp/current"
-    ruby_compat_version: RUBY1_9
-    jruby_home: "/opt/jruby"
-    java_home: "/opt/java"
-    output_path: "/etc/init.d"
-    pid_file: "/home/trinidad/myapp/shared/pids/trinidad.pid"
-    log_file: "/home/trinidad/myapp/shared/log/trinidad.log"
-    jsvc_path: "/usr/bin/jsvc"
-    trinidad_options: "-e production"
-    trinidad_name: Trinidad
-    trinidad_service_id: Trinidad # on Windows (defaults to :trinidad_name)
-    trinidad_service_desc: Trinidad Service Description # on Windows (optional)
+```yaml
+app_path: "/home/trinidad/myapp/current"
+#ruby_compat_version: RUBY1_9
+#service_id: Trinidad # on Windows (defaults to :trinidad_name)
+#service_desc: Trinidad Service Description # on Windows (optional)
+jruby_home: /opt/jruby
+java_home: /opt/java
+output_path: /etc/init.d
+pid_file: /home/trinidad/myapp/shared/pids/trinidad.pid
+out_file: /home/trinidad/myapp/shared/log/trinidad.out # std out/err
+jsvc_path: /usr/bin/jsvc # only used on Unix systems
+trinidad_opts: "-e production --threadsafe"
+java_opts: "-server -Xss1248k -XX:CompileThreshold=8000"
+configure_memory: true # asks you for memory requirements (merges java_opts)
+#total_memory: 720 # total dedicated in mega-bytes (assumes configure_memory)
+#hot_deployment: true # whether using hot-deploys (assumes configure_memory)
+```
 
 You can then run the installer like so:
 
     $ trinidad_init_service --defaults trinidad_init_defaults.yml
 
-If any of the required options are not provided in the configuration file, then 
-the installer will prompt you for them. If you're running this as part of an 
-environment initialization script than use the *--no-ask* option or provide 
+If any of the required options are not provided in the configuration file, then
+the installer will prompt you for them. If you're running this as part of an
+environment initialization script than use the *--know* option or provide
 only the defaults file path on the command line (make sure all required options
 are there) :
 
-    $ jruby -S trinidad_init_service trinidad_init_defaults.yml
+    $ jruby -S trinidad_init_service --know trinidad_init_defaults.yml
 
 
 **NOTE:** Do not confuse the *defaults.yml* "configuration" file with Trinidad's
 own configuration (*config/trinidad.yml*) file used when setting up the server !
 
 
-### Unix
+### Linux
 
 #### Requirements
 
@@ -63,17 +69,17 @@ you. However please note that to build JSVC on Unix you will need :
 
 #### Execution
 
-When the installation process finishes you can use the script generated to launch 
+When the installation process finishes you can use the script generated to launch
 the server as a daemon with the options start|stop|restart, i.e:
 
     $ /etc/init.d/trinidad restart
 
 #### Running as a Non-Root User
 
-By default, the Trinidad server process will run as the same user that ran the 
-`/etc/init.d/trinidad start` command. But the service can be configured to run 
-as a different user. The preferred method for doing this is the `run_user:` 
-attribute in the configuration YAML (or it's corresponding value at the prompt).  
+By default, the Trinidad server process will run as the same user that ran the
+`/etc/init.d/trinidad start` command. But the service can be configured to run
+as a different user. The preferred method for doing this is the `run_user:`
+attribute in the configuration YAML (or it's corresponding value at the prompt).
 For example:
 
     app_path: "/home/trinidad/myapp/current"
@@ -81,7 +87,7 @@ For example:
     run_user: trinidad
     # ...
 
-This causes the the server to run with non-root privileges (it essentially executes 
+This causes the the server to run with non-root privileges (it essentially executes
 as `sudo -u run_user jsvc ...`).
 
 On some platforms, however, it may be required that you use the JSVC `-user` argument.
@@ -89,12 +95,12 @@ This can be configured with the `JSVC_ARGS_EXTRA` environment variable, like thi
 
     JSVC_ARGS_EXTRA="-user myuser" /etc/init.d/trinidad start
 
-It not recommended that you mix the `-user` flag with the `run_user` option !
+It is not recommended that you mix the `-user` flag with the `run_user` option !
 
 #### Uninstall
 
-Manage as every other rc.d, assuming `update-rc.d -f /etc/init.d/trinidad defaults`
-you can uninstall using :
+manage as every other service (e.g. `update-rc.d -f trinidad defaults` on Ubuntu)
+you can even uninstall (will attempt to delete the script as well) using :
 
     $ [sudo] trinidad_init_service --uninstall /etc/init.d/trinidad
 
@@ -103,17 +109,22 @@ you can uninstall using :
 
 #### Execution
 
-Open the **Services** panel under **Administrative Tools** and look for a service 
-called **Trinidad** (or whatever name you have chosen).
+Open the **Services** panel under **Administrative Tools** and look for a service
+called **Trinidad** (or whatever name you have chosen) then *Start* it.
+
+By default the service is not setup to auto start during boot, that can be changed
+from the command-line or using  the Windows Services application.
 
 #### Uninstall
 
-To remove the service you're going to need the service id (name), than run :
+on Windows uninstallation requires to pass the service name (if not default) :
 
-    $ trinidad_init_service --uninstall Trinidad
+    $ jruby -S trinidad_init_service --uninstall Trinidad
 
+Please note that when the service gets uninstalled (on Windows) usually a restart
+is needed for it to be installable again.
 
 ## Copyright
 
-Copyright (c) 2012 [Team Trinidad](https://github.com/trinidad). 
+Copyright (c) 2012-2014 [Team Trinidad](https://github.com/trinidad).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.

data/Rakefile

@@ -5,12 +5,7 @@ rescue LoadError => e
   raise e
 end
 Bundler::GemHelper.install_tasks
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
+task :gem => :build
 
 task :default => :spec
 

data/bin/trinidad_init_service

@@ -10,14 +10,14 @@ require 'optparse'
 defaults = nil
 configuration = Trinidad::InitServices::Configuration.new
 
-opts = OptionParser.new do |opts|
+options = OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename(__FILE__)} [options] [defaults]"
-  
+
   opts.on('-h', '--help', 'print this help') do
     puts opts
     exit
   end
-  
+
   opts.on('-v', '--version', 'print version') do
     begin
       require 'trinidad'
@@ -28,26 +28,30 @@ opts = OptionParser.new do |opts|
     exit(0)
   end
 
-  opts.on('-d', '--defaults YAML_FILE', 'use passed file as defaults') do |config|
-    defaults = config
+  opts.on('-d', '--defaults YAML_FILE', 'use passed file as defaults') do |file|
+    defaults = file
   end
-  
-  opts.on('-s', '--silent', 'do not print output on console') do
+
+  opts.on('-s', '--silent', 'do not print any output on console') do
     configuration.say = false
   end
 
-  opts.on('--no-ask', 'disable interactive (console) mode') do
+  opts.on('-k', '--know', "don't ask (disable interactive mode)") do
     configuration.ask = false
   end
 
-  opts.on('--uninstall NAME', 'remove installed init service') do |name|
+  #opts.on('--no-ask', 'disable interactive (console) mode') do
+  #  configuration.ask = false
+  #end
+
+  opts.on('--uninstall [NAME]', 'remove installed init service') do |name|
     configuration.uninstall(name)
     exit(0)
   end
-  
+
 end
 
-opts.parse! ARGV
+options.parse! ARGV
 
 if ARGV.size > 0 # trinidad_init_service /home/trinidad/defaults.yml
   defaults = ARGV[0]

data/init.d/trinidad.erb

@@ -1,40 +1,60 @@
 #!/usr/bin/env bash
-# Trinidad init.d script using `jsvc` customized from the jsvc-wrapper.sh
+#
+# trinidad init.d script using `jsvc` customized from the jsvc-wrapper.sh
 # http://github.com/nicobrevin/jruby-jsvc/blob/master/bin/jsvc-wrapper.sh
 #
-# set on a per script/daemon basis (optional) :
-# APP_NAME - name of your application (defaults to "trinidad")
+# (c) generated by trinidad_init_services gem on <%= Time.now %>
+#
+### BEGIN INIT INFO
+# Provides: <%= @service_id || 'trinidad' %>
+# Required-Start: $network $syslog
+# Required-Stop: $network $syslog
+# Default-Start:
+# Default-Stop:
+# Description: <%= @service_desc %>
+# Short-Description: start and stop trinidad
+### END INIT INFO
+
+NAME="<%= @service_name %>"
+DESC="<%= @service_desc %>"
 
 # https://github.com/trinidad/trinidad_init_services/wiki/Installing-JSVC
 JSVC=<%= @jsvc %>
-JAVA_HOME=<%= @java_home %>
-JRUBY_HOME=<%= @jruby_home %>
-APP_PATH=<%= @app_path %>
-RUBY_SCRIPT=<%= @trinidad_daemon_path %>
+JAVA_HOME="<%= @java_home %>"
+JRUBY_HOME="<%= @jruby_home %>"
+BASE_PATH="<%= @app_path || @base_path %>"
+RUBY_SCRIPT="<%= @trinidad_daemon_path %>"
 # The user rights for the running daemon, if you don't bind directly to 80 than
 # it's always a good idea to run trinidad with non-root user rights.
-# Make sure this user has rights on PIDFILE and LOG_FILE paths.
+# Make sure this user has rights on PID_FILE and OUT_FILE paths.
 # Leaving this empty will cause the daemon to always run as whichever user calls
 # the script (which during init is equivalent to running it as root).
 RUN_USER="<%= @run_user %>"
 # Set this to "1" to echo commands before running them (for troubleshooting) :
 ECHO_COMMAND=""
 
-# Add here the options that Trinidad needs to run your application,
-# but DO NOT delete the -d option, i.e -e production
-TRINIDAD_OPTS="<%= @trinidad_options.join(" ") %>"
+# options that Trinidad needs to run your application, e.g. "-e production"
+TRINIDAD_OPTS="<%= @trinidad_opts.is_a?(String) ?  @trinidad_opts : @trinidad_opts.join(' ') %>"
+
+# a custom (daemon) script will be started (not jruby -S) thus JRUBY_OPTS
+# won't be picked up, however one can hand tune JAVA_OPTS here instead ...
+<% if @java_opts.empty? -%>
+JAVA_OPTS="$JAVA_OPTS"
+<% else -%>
+JAVA_OPTS="<%= @java_opts.is_a?(String) ? @java_opts : @java_opts.join(" \\\n") %>"
+<% end -%>
 
-PIDFILE=<%= @pid_file %>
-LOG_FILE=<%= @log_file %>
+PID_FILE="<%= @pid_file %>"
+OUT_FILE="<%= @out_file %>"
 
 # Create pidfile directory if missing
-# Todo: Remove PIDFILE_DIR creation once jsvc can be started
+# NOTE: Remove PID_FILE_DIR creation once jsvc can be started
 # as root using the -user option without any issues.
-PIDFILE_DIR=$(dirname $PIDFILE)
-if [ ! -d "$PIDFILE_DIR" ] ; then
-  mkdir -p $PIDFILE_DIR
+PID_FILE_DIR=$(dirname $PID_FILE)
+if [ ! -d "$PID_FILE_DIR" ] ; then
+  mkdir -p $PID_FILE_DIR
   if [ ! -z "$RUN_USER" ] ; then
-    chown -R $RUN_USER $PIDFILE_DIR
+    chown -R $RUN_USER $PID_FILE_DIR
   fi
 fi
 
@@ -43,7 +63,16 @@ MAIN_CLASS=com.msp.jsvc.JRubyDaemon
 
 CLASSPATH=<%= @classpath.join(":") %>
 
-JRUBY_SHELL=/bin/sh
+if [ ! -z "$BASE_PATH" ] ; then
+  if [ ! -d "$BASE_PATH" ]; then
+    echo "'$BASE_PATH' is not a directory"
+    exit 1
+  fi
+fi
+
+if [ -z "$JRUBY_SHELL" ] ; then
+  JRUBY_SHELL=/bin/sh
+fi
 
 JRUBY_NATIVE_PATH=""
 if [ -d "$JRUBY_HOME/lib/native/" ]; then
@@ -56,39 +85,56 @@ if [ -d "$JRUBY_HOME/lib/native/" ]; then
   done
 fi
 
-# JAVA_MEM, JAVA_MEM_MIN & JAVA_STACK are compatible with jruby's binary
+# JAVA_MEM, JAVA_MEM_MIN & JAVA_STACK compatible with JRuby's binary :
 
 if [ -z "$JAVA_MEM" ] ; then
-  JAVA_MEM=-Xmx500m
+  JAVA_MEM="-Xmx500m"
 fi
 # backwards compatibility we accept the non-full option (e.g. JAVA_MEM=500m)
-if [[ "$JAVA_MEM" != "-Xmx"* ]] ; then
+if [ "${JAVA_MEM:0:4}" != "-Xmx" ] ; then
   JAVA_MEM="-Xmx$JAVA_MEM"
 fi
 
 # we accept the non-full option (e.g. JAVA_MEM_MIN=500m)
-if [[ -n "$JAVA_MEM_MIN" && "$JAVA_MEM_MIN" != "-Xms"* ]] ; then
-  JAVA_MEM_MIN="-Xms$JAVA_MEM_MIN"
-fi
-if [ -z "$JAVA_MEM_MIN" ] ; then
-  JAVA_MEM_MIN=""
+if [ -n "$JAVA_MEM_MIN" ] ; then
+  if [ "${JAVA_MEM_MIN:0:4}" != "-Xms" ] ; then
+    JAVA_MEM_MIN="-Xms$JAVA_MEM_MIN"
+  fi
+else
+  if [ -z "$JAVA_MEM_MIN" ] ; then
+    JAVA_MEM_MIN=""
+  fi
 fi
 
 if [ -z "$JAVA_STACK" ] ; then
-  JAVA_STACK=-Xss2048k
+  JAVA_STACK="-Xss1536k"
 fi
 # backwards compatibility we accept the non-full option (e.g. JAVA_STACK=2048k)
-if [[ "$JAVA_STACK" != "-Xss"* ]] ; then
+if [ "${JAVA_STACK:0:4}" != "-Xss" ] ; then
   JAVA_STACK="-Xss$JAVA_STACK"
 fi
 
-# A custom (daemon) script will be started (not jruby -S) thus JRUBY_OPTS
-# won't be used here, feel free to hand tune JAVA_OPTS here instead ...
+if [ -z "$JAVA_OPTS" ] ; then
+  JAVA_OPTS="$JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK"
+else
+  for opt in Xmx Xss; do
+    if case ${JAVA_OPTS} in *"-${opt}"*) true;; *) false;; esac ; then
+      # JAVA_OPTS contains option - do no thing
+    else
+      if [ "${opt}" == "Xmx" ] ; then
+        JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN"
+      fi
+      if [ "${opt}" == "Xss" ] ; then
+        JAVA_OPTS="$JAVA_OPTS $JAVA_STACK"
+      fi
+    fi
+  done
+fi
 
-JAVA_OPTS="$JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
+JAVA_OPTS="$JAVA_OPTS -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
 
-# force file.encoding to UTF-8 :
-if [[ -z "$JAVA_ENCODING" ]]; then
+# force file.encoding to UTF-8 (if JAVA_ENCODING specified) :
+if [ -z "$JAVA_ENCODING" ]; then
   JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8"
 fi
 
@@ -99,36 +145,59 @@ JAVA_PROPS="$JAVA_PROPS \
 
 PROC_NAME=${SCRIPT_NAME:-${APP_NAME:-"trinidad"}}
 
+# should be multiple of 10 (min=10) :
+if [ -z "$JSVC_WAIT" ] ; then
+  JSVC_WAIT="20"
+fi
+
 JSVC_ARGS="-home $JAVA_HOME \
   $JSVC_ARGS_EXTRA \
-  -wait 20 \
-  -pidfile $PIDFILE \
+  -wait $JSVC_WAIT \
+  -pidfile $PID_FILE \
   -procname jsvc-$PROC_NAME \
-  -jvm server
-  -outfile $LOG_FILE \
-  -errfile &1"
+  -server"
+
+if [ -z "$JSVC_CWD" ] ; then
+  JSVC_CWD="$BASE_PATH"
+fi
+# NOTE: jsvc -cwd does not handle quoted (' or ") paths
+if [ "$JSVC_CWD" != "false" ] ; then
+  JSVC_ARGS="$JSVC_ARGS -cwd $JSVC_CWD"
+else
+  if [ ! -z "$BASE_PATH" ] ; then
+    cd "$BASE_PATH" || exit 1
+  fi
+fi
+
+if [ ! -z "$JSVC_STDIN" ] ; then
+  if [ "$JSVC_STDIN" != "false" ] ; then
+    JSVC_ARGS="$JSVC_ARGS -keepstdin"
+  fi
+fi
+
+JSVC_ARGS="$JSVC_ARGS -outfile $OUT_FILE -errfile &1"
 
 #
 # Stop/Start
 #
 
-if [[ -n "$RUN_USER" && $EUID -eq 0 ]]; then
-  JSVC="sudo -u $RUN_USER $JSVC"
+if [ -n "$RUN_USER" ]; then
+  if [ $EUID -eq 0 ]; then
+    JSVC="sudo -u $RUN_USER $JSVC"
+  fi
 fi
 
 STOP_COMMAND="$JSVC $JSVC_ARGS -stop $MAIN_CLASS"
 START_COMMAND="$JSVC $JSVC_ARGS -cp $CLASSPATH $JAVA_PROPS $JAVA_OPTS $MAIN_CLASS $RUBY_SCRIPT $TRINIDAD_OPTS"
 
-cd $APP_PATH || exit 1
-
 case "$1" in
     start)
-      if [ -e "$PIDFILE" ]; then
-          CUR_PID=$(<"$PIDFILE")
+      if [ -e "$PID_FILE" ]; then
+          CUR_PID=$(<"$PID_FILE")
           COM_NAME=$(ps -p $CUR_PID -o command= | cut -d ' ' -f 1)
           PROCESS_NAME="jsvc-$PROC_NAME"
           if [ "$COM_NAME" != "$PROCESS_NAME" ]; then
-              rm $PIDFILE
+              rm $PID_FILE
               $START_COMMAND
           else
               echo "Pidfile already exists for pid $CUR_PID, not starting."
@@ -145,7 +214,7 @@ case "$1" in
       fi
       ;;
     stop)
-      if [ -e "$PIDFILE" ]; then
+      if [ -e "$PID_FILE" ]; then
           echo "Stopping $PROC_NAME daemon..."
           if [ -n "$ECHO_COMMAND" ]; then echo $STOP_COMMAND; fi
           $STOP_COMMAND
@@ -155,12 +224,12 @@ case "$1" in
       fi
       ;;
     restart)
-      if [ -e "$PIDFILE" ]; then
+      if [ -e "$PID_FILE" ]; then
           echo "Stopping $PROC_NAME daemon..."
           if [ -n "$ECHO_COMMAND" ]; then echo $STOP_COMMAND; fi
           $STOP_COMMAND
       fi
-      if [ -e "$PIDFILE" ]; then
+      if [ -e "$PID_FILE" ]; then
           echo "Pidfile still present, $PROC_NAME hasn't stopped"
           exit 1
       else
@@ -173,8 +242,8 @@ case "$1" in
       fi
       ;;
     status)
-      if [ "$PIDFILE" ]; then
-          PID=`cat $PIDFILE`
+      if [ "$PID_FILE" ]; then
+          PID=`cat $PID_FILE`
           OUTPUT=`ps -o pid $PID | grep "$PID"`
           if [ ${#OUTPUT} -gt 0 ]; then
               echo "Service running with pid: $PID"