rubber 1.7.0 → 1.7.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+1.7.0
+-----
+
+Better support for Windows in some cases. <a8f3192> [Kevin Menard]
+Enhanced describe_bundles. <6f2b1f4> [Kevin Menard]
+Added support for starting EC2 instances with EBS root devices. <9296921> [Kevin Menard]
+Added support for stopping EC2 instances with EBS root devices. <a2a70ec> [Kevin Menard]
+Added reboot command for rebooting stuck EC2 instances. <1d29437> [Kevin Menard]
+
 1.6.3
 -----
 

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.0.11
+rvm_version: 1.0.15
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf

@@ -6,14 +6,14 @@
   <%
     PIDFILE = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
 
-    start_program = "cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}"
-    stop_program  = "cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i}"
+    start_program = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}'"
+    stop_program  = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i} TERM'"
   %>
 
   check process resque_worker_<%= i %> with pidfile <%= PIDFILE %>
     group resque_worker
-    start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= start_program %>'"
-    stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= stop_program %>'"
+    start program = "<%= start_program %>"
+    stop program = "<%= stop_program %>"
 
     if totalmem > 350.0 MB for 15 cycles then restart
 <% end %>

data/generators/vulcanize/templates/resque/script/resque_worker_management.rb

@@ -1,22 +1,34 @@
 #!/usr/bin/env ruby
 
-env = ENV["RUBBER_ENV"] ||= "development"
-root = File.join(File.dirname(__FILE__), '..')
-rails_env_file = File.join(root, 'config', 'environment.rb')
-
-if File.exists? rails_env_file
-  require(rails_env_file)
-else
-  require "rubber"
-  Rubber::initialize(root, env)
-  require 'resque'
-  require "#{root}/config/initializers/resque.rb"
+STDOUT.sync = true
+STDERR.sync = true
+
+def load_env(rubber_only=true)
+  env = ENV["RUBBER_ENV"] ||= "development"
+  root = File.expand_path('../..', __FILE__)
+  rails_env_file = File.join(root, 'config', 'environment.rb')
+
+  if ! rubber_only && File.exists?(rails_env_file)
+    require(rails_env_file)
+  else
+    require "bundler/setup" if File.exist?(File.join(root, "Gemfile"))
+    require "rubber"
+    Rubber::initialize(root, env)
+  end
 end
 
+
 def start_all(workers)
   puts "Starting all workers"
-  workers.each_with_index do |worker, i|
-    start(worker, i)
+  # fork then load rails env so script runs quick, yet we don't overload
+  # machine by loading env for each worker
+  daemonize(log_file('all')) do
+    load_env(false)
+    puts "Preloaded environment for all workers"
+
+    workers.each_with_index do |worker, i|
+      start(worker, i)
+    end
   end
 end
 
@@ -29,6 +41,9 @@ def start(worker, index)
   queues = worker.queues.to_s.split(',')
 
   daemonize(log_file, pid_file) do
+    # load env for each worker, if starting multiple, this will be a no-op due
+    # to start_all preloading the env
+    load_env(false)
     resque_worker = Resque::Worker.new(*queues)
     resque_worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
     resque_worker.very_verbose = ENV['VVERBOSE']
@@ -36,24 +51,32 @@ def start(worker, index)
     puts "*** Starting worker #{resque_worker}"
     resque_worker.work(worker.poll_interval.to_i || 5) # interval, will block
   end
+
 end
 
-def stop_all(workers)
+def stop_all(workers, signal)
   puts "Stopping all workers"
   workers.size.times do |i|
-    stop(i)
+    stop(i, signal)
   end
 end
 
-def stop(index)
+# Resque workers respond to a few different signals:
+#
+# QUIT - Wait for child to finish processing then exit
+# TERM / INT - Immediately kill child then exit
+# USR1 - Immediately kill child but don't exit
+# USR2 - Don't start to process any new jobs
+# CONT - Start to process new jobs again after a USR2
+def stop(index, signal)
   puts "Stopping worker #{index}"
-  
+
   pid_file = pid_file(index)
   pid = File.read(pid_file).to_i rescue nil
   if pid
-    puts "Killing worker #{index}: pid #{pid}"
+    puts "Killing worker #{index}: pid #{pid} - #{signal}"
     begin
-      Process.kill("QUIT", pid)
+      Process.kill(signal, pid)
     rescue Exception => e
       puts e
     end
@@ -63,19 +86,21 @@ def stop(index)
   end
 end
 
-def daemonize(log_file, pid_file)
+def daemonize(log_file, pid_file=nil)
   return if fork
   Process::setsid
   exit!(0) if fork
-  Dir::chdir("/")
+  Dir::chdir(Rubber.root)
   File.umask 0000
   FileUtils.touch log_file
   STDIN.reopen    log_file
   STDOUT.reopen   log_file, "a"
   STDERR.reopen   log_file, "a"
+  STDOUT.sync = true
+  STDERR.sync = true
+
+  File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") } if pid_file
 
-  File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") }
-  
   yield if block_given?
   exit(0)
 end
@@ -90,23 +115,30 @@ end
 
 action = ARGV[0]
 worker_index = ARGV[1] ? ARGV[1].to_i : nil
+signal = ARGV[2] || "QUIT"
 if action.nil? || ! %w[start stop restart].include?(action)
   puts "Usage: script/resque_worker_management.rb [start|stop|restart]"
 end
 
+# load just the rubber env so things run quickly
+load_env(true)
 workers = Rubber.config.resque_workers
 
 case action
   when 'start'
     worker_index ? start(workers[worker_index], worker_index) : start_all(workers)
+    # sleep a bit to allow daemonization to complete
+    sleep 0.5
   when 'stop'
-    worker_index ? stop(worker_index) : stop_all(workers)
+    worker_index ? stop(worker_index, signal) : stop_all(workers, signal)
   when 'restart'
     if worker_index
-      stop(worker_index)
+      stop(worker_index, signal)
       start(workers[worker_index], worker_index)
     else
-      stop_all(workers)
+      stop_all(workers, signal)
       start_all(workers)
     end
+    # sleep a bit to allow daemonization to complete
+    sleep 0.5
 end

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.0.11
+rvm_version: 1.0.15
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/lib/generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf

@@ -6,14 +6,14 @@
   <%
     PIDFILE = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
 
-    start_program = "cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}"
-    stop_program  = "cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i}"
+    start_program = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}'"
+    stop_program  = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i} TERM'"
   %>
 
   check process resque_worker_<%= i %> with pidfile <%= PIDFILE %>
     group resque_worker
-    start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= start_program %>'"
-    stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= stop_program %>'"
+    start program = "<%= start_program %>"
+    stop program = "<%= stop_program %>"
 
     if totalmem > 350.0 MB for 15 cycles then restart
 <% end %>

data/lib/generators/vulcanize/templates/resque/script/resque_worker_management.rb

@@ -1,22 +1,34 @@
 #!/usr/bin/env ruby
 
-env = ENV["RUBBER_ENV"] ||= "development"
-root = File.join(File.dirname(__FILE__), '..')
-rails_env_file = File.join(root, 'config', 'environment.rb')
-
-if File.exists? rails_env_file
-  require(rails_env_file)
-else
-  require "rubber"
-  Rubber::initialize(root, env)
-  require 'resque'
-  require "#{root}/config/initializers/resque.rb"
+STDOUT.sync = true
+STDERR.sync = true
+
+def load_env(rubber_only=true)
+  env = ENV["RUBBER_ENV"] ||= "development"
+  root = File.expand_path('../..', __FILE__)
+  rails_env_file = File.join(root, 'config', 'environment.rb')
+
+  if ! rubber_only && File.exists?(rails_env_file)
+    require(rails_env_file)
+  else
+    require "bundler/setup" if File.exist?(File.join(root, "Gemfile"))
+    require "rubber"
+    Rubber::initialize(root, env)
+  end
 end
 
+
 def start_all(workers)
   puts "Starting all workers"
-  workers.each_with_index do |worker, i|
-    start(worker, i)
+  # fork then load rails env so script runs quick, yet we don't overload
+  # machine by loading env for each worker
+  daemonize(log_file('all')) do
+    load_env(false)
+    puts "Preloaded environment for all workers"
+
+    workers.each_with_index do |worker, i|
+      start(worker, i)
+    end
   end
 end
 
@@ -29,6 +41,9 @@ def start(worker, index)
   queues = worker.queues.to_s.split(',')
 
   daemonize(log_file, pid_file) do
+    # load env for each worker, if starting multiple, this will be a no-op due
+    # to start_all preloading the env
+    load_env(false)
     resque_worker = Resque::Worker.new(*queues)
     resque_worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
     resque_worker.very_verbose = ENV['VVERBOSE']
@@ -36,24 +51,32 @@ def start(worker, index)
     puts "*** Starting worker #{resque_worker}"
     resque_worker.work(worker.poll_interval.to_i || 5) # interval, will block
   end
+
 end
 
-def stop_all(workers)
+def stop_all(workers, signal)
   puts "Stopping all workers"
   workers.size.times do |i|
-    stop(i)
+    stop(i, signal)
   end
 end
 
-def stop(index)
+# Resque workers respond to a few different signals:
+#
+# QUIT - Wait for child to finish processing then exit
+# TERM / INT - Immediately kill child then exit
+# USR1 - Immediately kill child but don't exit
+# USR2 - Don't start to process any new jobs
+# CONT - Start to process new jobs again after a USR2
+def stop(index, signal)
   puts "Stopping worker #{index}"
-  
+
   pid_file = pid_file(index)
   pid = File.read(pid_file).to_i rescue nil
   if pid
-    puts "Killing worker #{index}: pid #{pid}"
+    puts "Killing worker #{index}: pid #{pid} - #{signal}"
     begin
-      Process.kill("QUIT", pid)
+      Process.kill(signal, pid)
     rescue Exception => e
       puts e
     end
@@ -63,19 +86,21 @@ def stop(index)
   end
 end
 
-def daemonize(log_file, pid_file)
+def daemonize(log_file, pid_file=nil)
   return if fork
   Process::setsid
   exit!(0) if fork
-  Dir::chdir("/")
+  Dir::chdir(Rubber.root)
   File.umask 0000
   FileUtils.touch log_file
   STDIN.reopen    log_file
   STDOUT.reopen   log_file, "a"
   STDERR.reopen   log_file, "a"
+  STDOUT.sync = true
+  STDERR.sync = true
+
+  File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") } if pid_file
 
-  File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") }
-  
   yield if block_given?
   exit(0)
 end
@@ -90,23 +115,30 @@ end
 
 action = ARGV[0]
 worker_index = ARGV[1] ? ARGV[1].to_i : nil
+signal = ARGV[2] || "QUIT"
 if action.nil? || ! %w[start stop restart].include?(action)
   puts "Usage: script/resque_worker_management.rb [start|stop|restart]"
 end
 
+# load just the rubber env so things run quickly
+load_env(true)
 workers = Rubber.config.resque_workers
 
 case action
   when 'start'
     worker_index ? start(workers[worker_index], worker_index) : start_all(workers)
+    # sleep a bit to allow daemonization to complete
+    sleep 0.5
   when 'stop'
-    worker_index ? stop(worker_index) : stop_all(workers)
+    worker_index ? stop(worker_index, signal) : stop_all(workers, signal)
   when 'restart'
     if worker_index
-      stop(worker_index)
+      stop(worker_index, signal)
       start(workers[worker_index], worker_index)
     else
-      stop_all(workers)
+      stop_all(workers, signal)
       start_all(workers)
     end
+    # sleep a bit to allow daemonization to complete
+    sleep 0.5
 end

data/lib/rubber.rb

@@ -67,4 +67,10 @@ require 'rubber/generator'
 require 'rubber/instance'
 require 'rubber/util'
 require 'rubber/cloud'
-require 'rubber/dns'
+require 'rubber/dns'
+
+if Rubber::Util::is_rails3?
+  module Rubber
+    require 'rubber/railtie'
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency