standup 0.6.3 → 0.6.4

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 
   def self.version
     VERSION

data/scripts/passenger.rb

@@ -7,7 +7,7 @@ Standup.script :node do
     scripts.ec2.open_port 80, 443
 
     if install_gem('passenger', params.version) || !file_exists?('/opt/nginx/sbin/nginx')
-      install_package 'libcurl4-openssl-dev'
+      install_package 'libcurl4-openssl-dev libpcrecpp0'
       sudo 'passenger-install-nginx-module --auto --auto-download --prefix=/opt/nginx'
     end
 

data/scripts/resque/resque

@@ -7,4 +7,5 @@ if [  $1 = "ALL_QUEUES" ];then
     QUEUE=$1
 fi
 
-sudo -u www-data /usr/local/rvm/bin/rvm-shell -c "cd <%= scripts.webapp.app_path%> && RAILS_ENV=<%= scripts.webapp.params.rails_env%> QUEUE=$QUEUE VERBOSE=1 PIDFILE=tmp/pids/resque_$1_$2.pid nohup bundle exec rake environment resque:work >> log/resque_worker_$1_$2.log 2>&1 &"
+<% cmd = "cd #{scripts.webapp.app_path} && RAILS_ENV=#{scripts.webapp.params.rails_env} QUEUE=$QUEUE VERBOSE=1 PIDFILE=tmp/pids/resque_$1_$2.pid nohup bundle exec rake environment resque:work >> log/resque_worker_$1_$2.log 2>&1 &" %>
+<%= with_context({:user => 'www-data'}) { remote_command(cmd) } %>

data/scripts/resque_scheduler/resque_scheduler

@@ -0,0 +1,4 @@
+#!/bin/bash
+export HOME="/home/<%= scripts.ec2.params.ssh_user %>"
+
+sudo -u www-data /bin/bash -c "cd <%= scripts.webapp.app_path%> && RAILS_ENV=<%= scripts.webapp.params.rails_env%> VERBOSE=1 PIDFILE=<%= scripts.webapp.app_path%>/tmp/pids/resque_scheduler.pid BACKGROUND=yes bundle exec rake resque:scheduler --trace  >> <%= scripts.webapp.app_path%>/log/resque_scheduler.log 2>&1 &"

data/scripts/resque_scheduler/resque_scheduler_monit.conf

@@ -0,0 +1,11 @@
+<%# ((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_scheduler
+  with pidfile <%= scripts.webapp.app_path%>/tmp/pids/resque_scheduler.pid
+  start program = "/bin/bash -c 'cd <%= scripts.webapp.app_path%>; RAILS_ENV=<%= scripts.webapp.params.rails_env%> script/resque_scheduler'"  with timeout 120 seconds
+  stop program = "/bin/bash -c 'cd <%= scripts.webapp.app_path%> && kill -s QUIT `cat tmp/pids/resque_scheduler.pid` && rm -f tmp/pids/resque_scheduler.pid; exit 0;'"
+  if totalmem is greater than 300 MB for 10 cycles then restart
+  group resque
+
+<%# end %>
+<%# end %>

data/scripts/resque_scheduler.rb

@@ -0,0 +1,31 @@
+Standup.script :node do
+  def run
+    #scripts.redis.run unless scripts.redis.installed?
+
+    path_to_resque_exec = "#{scripts.webapp.app_path}/script/resque_scheduler"
+    with_processed_file script_file('resque_scheduler') do |file|
+      upload file,
+             :to => path_to_resque_exec,
+             :sudo => true
+    end
+
+    sudo "chown www-data:www-data #{path_to_resque_exec}"
+    sudo "chmod +x #{path_to_resque_exec}"
+
+    sudo "mkdir #{scripts.webapp.app_path}/tmp/pids"
+    sudo "chown www-data:www-data #{scripts.webapp.app_path}/tmp/pids"
+    with_processed_file script_file('resque_scheduler_monit.conf') do |file|
+      scripts.monit.add_watch file
+    end
+
+    restart
+  end
+
+  def restart
+    #((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|
+    scripts.monit.restart_watch "resque_scheduler"
+    #end
+    #end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standup
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70321382354960 !ruby/object:Gem::Requirement
+  requirement: &70283747287040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382354960
+  version_requirements: *70283747287040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70321382352760 !ruby/object:Gem::Requirement
+  requirement: &70283747286540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321382352760
+  version_requirements: *70283747286540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70321382365540 !ruby/object:Gem::Requirement
+  requirement: &70283747286080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382365540
+  version_requirements: *70283747286080
 - !ruby/object:Gem::Dependency
   name: settingslogic
-  requirement: &70321382363300 !ruby/object:Gem::Requirement
+  requirement: &70283747285620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382363300
+  version_requirements: *70283747285620
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
-  requirement: &70321382361860 !ruby/object:Gem::Requirement
+  requirement: &70283747285160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382361860
+  version_requirements: *70283747285160
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70321382388220 !ruby/object:Gem::Requirement
+  requirement: &70283747284700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382388220
+  version_requirements: *70283747284700
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70321382386440 !ruby/object:Gem::Requirement
+  requirement: &70283747284240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321382386440
+  version_requirements: *70283747284240
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70321382382040 !ruby/object:Gem::Requirement
+  requirement: &70283747283780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70321382382040
+  version_requirements: *70283747283780
 description: ''
 email:
 - ilia@flamefork.ru
@@ -171,6 +171,9 @@ files:
 - scripts/resque.rb
 - scripts/resque/resque
 - scripts/resque/resque_monit.conf
+- scripts/resque_scheduler.rb
+- scripts/resque_scheduler/resque_scheduler
+- scripts/resque_scheduler/resque_scheduler_monit.conf
 - scripts/ruby.rb
 - scripts/ruby/gemrc
 - scripts/setup.rb
@@ -196,18 +199,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1022148714891701191
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1022148714891701191
 requirements: []
 rubyforge_project: standup
 rubygems_version: 1.8.11