trinidad_init_services 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 1.1.2 (2012-01-17)
+
+* Revert previous fix.
+* Fix #10: use a better procfile name.
+
 == 1.1.1 (2012-01-16)
 
 * Fix #8: issue on with -errfile &1 being misinterpreted.

data/init.d/trinidad.erb

@@ -5,9 +5,7 @@
 # Contains common parameters and start/stop
 
 # Things you'll need to set on a per script/daemon basis:
-# SCRIPT_NAME - Path to the ruby script which creates a Daemon
-# object for jsvc to control
-# APP_NAME - Name of your application
+# APP_NAME - name of your application (defaults to "trinidad")
 #
 # Things you can set:
 # PROG_OPTS - Arguments to send to the program. A few defaults are appended to this.
@@ -46,16 +44,17 @@ JAVA_PROPS="$JAVA_PROPS -Djruby.memory.max=500m \
   $JRUBY_OPTS"
 
 JAVA_OPTS="-Xmx500m -Xss1024k -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
+PROC_NAME=${SCRIPT_NAME:-${APP_NAME:-"trinidad"}}
 
 JSVC_ARGS="-home $JAVA_HOME \
   $JSVC_ARGS_EXTRA \
   -wait 20 \
   -pidfile $PIDFILE \
   -user $USER \
-  -procname jsvc-$SCRIPT_NAME \
+  -procname jsvc-$PROC_NAME \
   -jvm server
   -outfile $LOG_FILE \
-  -errfile '&1'"
+  -errfile &1"
 
 #
 # Stop/Start
@@ -72,7 +71,7 @@ case "$1" in
           echo "Pidfile already exists, not starting."
           exit 1
       else
-          echo "Starting $SCRIPT_NAME daemon..."
+          echo "Starting $PROC_NAME daemon..."
           $START_COMMAND
           EXIT_CODE=$?
           if [ "$EXIT_CODE" != 0 ]; then
@@ -82,7 +81,7 @@ case "$1" in
       ;;
     stop)
       if [ -e "$PIDFILE" ]; then
-          echo "Stopping $SCRIPT_NAME daemon..."
+          echo "Stopping $PROC_NAME daemon..."
           $STOP_COMMAND
       else
           echo "No pid file, not stopping."
@@ -91,11 +90,11 @@ case "$1" in
       ;;
     restart)
       if [ -e "$PIDFILE" ]; then
-          echo "Stopping $SCRIPT_NAME daemon..."
+          echo "Stopping $PROC_NAME daemon..."
           $STOP_COMMAND
       fi
       if [ -e "$PIDFILE" ]; then
-          echo "Pidfile still present, $SCRIPT_NAME hasn't stopped"
+          echo "Pidfile still present, $PROC_NAME hasn't stopped"
           exit 1
       else
           $START_COMMAND

data/lib/trinidad_init_services.rb

@@ -3,7 +3,7 @@ require 'trinidad'
 
 module Trinidad
   module Daemon
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
 
     def init
     end

data/trinidad_init_services.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_init_services'
-  s.version           = '1.1.1'
-  s.date              = '2012-01-16'
+  s.version           = '1.1.2'
+  s.date              = '2012-01-17'
   s.rubyforge_project = 'trinidad_init_services'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trinidad_init_services
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trinidad
-  requirement: &2153204080 !ruby/object:Gem::Requirement
+  requirement: &2153350240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153204080
+  version_requirements: *2153350240
 description: Trinidad init service scripts on Apache Commons Daemon and JRuby-jsvc,
   compatible with Unix and Windows services
 email: calavera@apache.org