fixing backgroundjob script

gabriel · May 9, 2008 · 7a76473 · 7a76473
1 parent 4b905ab
commit 7a76473
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/History.txt b/History.txt
@@ -1,8 +1,13 @@
-== 0.3.5 ?
+== 0.3.6 ?
+
+* Fixing backgroundjob to use --daemon
+
+== 0.3.5 2008-05-08
 
 * Adding merb:migrate recipe
 * Fixing merb monitrc
 * Added preview variables prompt
+* Fixed merb logrotate defaults
 
 == 0.3.4 2008-05-05
 

diff --git a/lib/recipes/centos/backgroundjob.rb b/lib/recipes/centos/backgroundjob.rb
@@ -11,7 +11,7 @@
     <dd class="default">Defaults to: 
     <pre>
       \#{current_path}/script/bj --forever --rails_env=production --rails_root=\#{current_path} --redirect \
-      --redirect=\#{backgroundjob_log_path} --pidfile=\#{backgroundjob_pid_path} &
+      --redirect=\#{backgroundjob_log_path} --pidfile=\#{backgroundjob_pid_path} --daemon
     </pre>
     </dd>
     <dt>backgroundjob_pid_path</dt>
@@ -30,10 +30,9 @@
       fetch_or_default(:backgroundjob_log_path, "#{shared_path}/log/bj.log")
 
       default_bin_path = "#{current_path}/script/bj run --forever --rails_env=production --rails_root=#{current_path} \
---redirect=#{backgroundjob_log_path} --pidfile=#{backgroundjob_pid_path} &"
-
-      fetch_or_default(:backgroundjob_bin_path, default_bin_path)
+--redirect=#{backgroundjob_log_path} --pidfile=#{backgroundjob_pid_path} --daemon"
 
+      fetch_or_default(:backgroundjob_bin_path, default_bin_path)      
 
       # Install initscript      
       utils.install_template("backgroundjob/backgroundjob.initd.centos.erb", "/etc/init.d/backgroundjob_#{application}")

diff --git a/lib/templates/backgroundjob/backgroundjob.initd.centos.erb b/lib/templates/backgroundjob/backgroundjob.initd.centos.erb
@@ -13,20 +13,20 @@
 RETVAL=0
 
 DESC="backgroundjob daemon (<%= application %>)"
-DAEMON="<%= backgroundjob_bin_path %>"
-PIDFILE="<%= backgroundjob_pid_path %>"
+BIN_PATH"<%= backgroundjob_bin_path %>"
+PID_FILE="<%= backgroundjob_pid_path %>"
 
 start() {
   echo -n $"Starting $DESC: "
-  daemon --user sick --pidfile $PIDFILE $DAEMON
+  daemon --user sick $BIN_PATH
   RETVAL=$?
   echo
   return $RETVAL;  
 }
 
 stop() {
   echo -n $"Stopping $DESC:"
-  killproc -p $PIDFILE
+  killproc -p $PID_FILE
   RETVAL=$?
   echo 
   return $RETVAL;