standup 0.3.31 → 0.3.32

data/VERSION

@@ -1 +1 @@
-0.3.31
+0.3.32

data/scripts/resque/resque

@@ -2,9 +2,8 @@
 export HOME="/home/<%= scripts.ec2.params.ssh_user %>"
 
 if [  $1 = "ALL_QUEUES" ];then
-    QUEUE=*
+    sudo -u www-data -E QUEUE=* VERBOSE=1 nohup rake environment resque:work >> log/resque_worker_$1_$2.log 2>&1 &
   else
-    QUEUE=$1
+    sudo -u www-data -E QUEUE=$1 VERBOSE=1 nohup rake environment resque:work >> log/resque_worker_$1_$2.log 2>&1 &
 fi
-
-sudo -u www-data -E QUEUE=$QUEUE VVERBOSE=1 PIDFILE=tmp/pids/resque_$1_$2.pid nohup rake environment resque:work >> log/resque_worker_$1_$2.log 2>&1 &
+echo $(($! - 1)) > tmp/pids/resque_$1_$2.pid

data/scripts/resque/resque_monit.conf

@@ -1,11 +1,13 @@
 <% ((scripts.webapp.params.has_key?(:resque_queues) && scripts.webapp.params.resque_queues.presence) || {"ALL_QUEUES" => 1 }).each_pair do |queue_name,num_of_workers|%>
 <%1.upto(num_of_workers)  do |num|%>
 check process resque_<%= queue_name %>_<%= num %>
+  group resque
   with pidfile <%= scripts.webapp.app_path%>/tmp/pids/resque_<%= queue_name %>_<%=num %>.pid
   start program = "/bin/sh -c 'cd <%= scripts.webapp.app_path%>; RAILS_ENV=<%= scripts.webapp.params.rails_env%> script/resque <%= queue_name %> <%=num %>'"
   stop program = "/bin/sh -c 'cd <%= scripts.webapp.app_path%> && kill -s QUIT `cat tmp/pids/resque_<%= queue_name %>_<%=num %>.pid` && rm -f tmp/pids/resque_<%= queue_name %>_<%=num %>.pid; exit 0;'"
   if totalmem is greater than 300 MB for 10 cycles then restart
-    <% end %>
+
+<% end %>
 <% end %>
 
 #check process resque

data/standup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.31"
+  s.version = "0.3.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Artem Orlov", "Cloud Castle Inc."]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 83
   prerelease: 
   segments: 
   - 0
   - 3
-  - 31
-  version: 0.3.31
+  - 32
+  version: 0.3.32
 platform: ruby
 authors: 
 - Ilia Ablamonov