rails_pwnerer 0.5.16 → 0.5.17

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.17. Ability to call custom scripts during an app's lifecycle.
+
 v0.5.16. Letter-based database passwords (ruby's mysql doesn't like numbers).
  
 v0.5.15. Home-baked process info (in case Sys::Proctable doesn't work).

data/Manifest

@@ -8,6 +8,7 @@ lib/pwnage/app/database.rb
 lib/pwnage/app/gems.rb
 lib/pwnage/app/main.rb
 lib/pwnage/app/nginx_config.rb
+lib/pwnage/app/scripts.rb
 lib/pwnage/app/svn.rb
 lib/pwnage/base/atomics.rb
 lib/pwnage/base/dirs.rb
@@ -36,6 +37,8 @@ lib/pwnage/scaffolds/mysql_config.rb
 lib/pwnage/scaffolds/packages.rb
 lib/pwnage/scaffolds/rubygems.rb
 lib/pwnage/scaffolds/sshd.rb
+lib/pwnage/util/kill_process_set.rb
+lib/pwnage/util/main.rb
 lib/rails_pwnerer.rb
 LICENSE
 Manifest

data/lib/pwnage/app/cluster_config.rb

@@ -59,67 +59,28 @@ class RailsPwnage::App::ClusterConfig
   def remove_mongrels(app_name, instance_name)
     # bomb the configuration from the launch directory
     launch_config = File.join RailsPwnage::Config.path_to(:mongrel_configs), "#{app_name}.#{instance_name}.yml"
-    File.delete launch_config if File.exists? launch_config   
+    File.delete launch_config if File.exists? launch_config
   end
   
-  def kill_stray_mongrels(app_name, instance_name)
-    app_config = RailsPwnage::Config[app_name, instance_name]
-    # silently die if the app was completely busted
-    return unless app_config and File.exists? app_config[:app_path]
-    
-    # a list of patterns that show up in mongrels' cmdline
-    patterns = ['mongrel', app_config[:app_path] + ' ', 'tmp/pids/mongrel', 'log/mongrel']
-    
-    Dir.chdir app_config[:app_path] do
-      # Phase 1: look through PID files and issue kill orders
-      pinfo = process_info()
-      Dir.glob('tmp/pids/*.pid').each do |fname|
-        begin
-          pid = File.open(fname, 'r') { |f| f.read.strip! }
-          # avoid killing innocent victims
-          if pinfo[pid].nil? or patterns.all? { |pattern| pinfo[pid][:cmdline].index pattern } 
-            print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n"
-            Process.kill 'TERM', pid.to_i
-          end
-        rescue
-          # just in case the file gets wiped before we see it
-        end
-        begin
-          print "Deleting #{fname}\n"
-          File.delete fname if File.exists? fname
-        rescue
-          # prevents crashing if the file is wiped after we call exists?
-        end
-      end
-      
-      # Phase 2: look through the process table and kill anything that looks good
-      pinfo = process_info()
-      pinfo.each do |pid, info|
-        next unless patterns.all? { |pattern| info[:cmdline].index pattern }
-        print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n"
-        Process.kill 'TERM', pid.to_i
-      end
-    end
-  end
-  
-  def stop_mongrels(app_name, instance_name)
+  def stop(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
     # silently die if the app was completely busted
     return unless app_config and File.exists? app_config[:app_path]
+        
+    cmdline_patterns = ['mongrel', app_config[:app_path] + ' ', 'tmp/pids/mongrel', 'log/mongrel']
     
     Dir.chdir app_config[:app_path] do
-      Kernel.system 'mongrel_rails cluster::stop'
+      RailsPwnage::Util.kill_process_set('mongrel_rails cluster::stop',
+        'tmp/pids/*.pid', cmdline_patterns, :verbose => false, :sleep_delay => 0.5)
     end
-    sleep 0.5
-    kill_stray_mongrels app_name, instance_name
   end
   
-  def start_mongrels(app_name, instance_name)
+  def start(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
     # silently die if the app was completely busted
     return unless app_config and File.exists? app_config[:app_path]
 
-    kill_stray_mongrels app_name, instance_name
+    stop app_name, instance_name
     
     # alloc a port if somehow that slipped through the cracks
     if app_config[:port0] == 0
@@ -140,20 +101,17 @@ class RailsPwnage::App::ClusterConfig
     # no need to configure nginx here, it'll be done by the executor
   end
   
-  def update(app_name, instance_name, &update_proc)
-    stop_mongrels app_name, instance_name
+  def pre_update(app_name, instance_name, &update_proc)
     manage_ports app_name, instance_name, :free
-    yield
-  ensure
+  end
+  def post_update(app_name, instance_name)
     manage_ports app_name, instance_name, :alloc
     configure_mongrels app_name, instance_name
     fix_permissions app_name, instance_name
-    start_mongrels app_name, instance_name
-    RailsPwnage::App::NginxConfig.new.update app_name, instance_name
   end
   
   def remove(app_name, instance_name)
-    stop_mongrels app_name, instance_name
+    stop app_name, instance_name
     remove_mongrels app_name, instance_name
     manage_ports app_name, instance_name, :free
   end
@@ -172,9 +130,9 @@ class RailsPwnage::App::ClusterConfig
     RailsPwnage::Config.all_applications.each do |ai|
       case action
       when :start
-        RailsPwnage::App::ClusterConfig.new.start_mongrels ai[0], ai[1]
+        RailsPwnage::App::ClusterConfig.new.start ai[0], ai[1]
       when :stop
-        RailsPwnage::App::ClusterConfig.new.stop_mongrels ai[0], ai[1]        
+        RailsPwnage::App::ClusterConfig.new.stop ai[0], ai[1]        
       end
     end 
   end  

data/lib/pwnage/app/main.rb

@@ -18,7 +18,7 @@ module RailsPwnage::App
       Config.new.alloc app, instance
       rails_root = Svn.new.checkout svn_path, app, instance
       if rails_root
-        [Config, Svn, Gems, Database, ClusterConfig, NginxConfig].each do |mod|
+        [Config, Svn, Gems, Database, ClusterConfig, NginxConfig, Scripts].each do |mod|
           mod.new.setup app, instance
         end
       else
@@ -32,9 +32,9 @@ module RailsPwnage::App
   # updates an application (restart servers if necessary)
   def self.update(app_name, instance_name)    
     instance_magic(app_name, instance_name) do |app, instance|
-      ClusterConfig.new.update app, instance do
-        [Svn, Config, Gems, Database].each do |mod|
-          mod.new.update app, instance  
+      update_app app, instance do
+        [Svn, Config, Gems, Database, Scripts].each do |mod|
+          mod.new.update app, instance
         end
       end    
       NginxConfig.new.update app, instance
@@ -50,6 +50,20 @@ module RailsPwnage::App
     end    
   end
 
+  def self.update_app(app_name, instance_name, &block)
+    Scripts.new.pre_stop app_name, instance_name
+    ClusterConfig.new.stop app_name, instance_name
+    ClusterConfig.new.pre_update app_name, instance_name
+    Scripts.new.post_stop app_name, instance_name
+    yield
+  ensure
+    ClusterConfig.new.post_update app_name, instance_name
+    NginxConfig.new.update app_name, instance_name    
+    Scripts.new.pre_start app_name, instance_name
+    ClusterConfig.new.start app_name, instance_name
+    Scripts.new.post_start app_name, instance_name
+  end
+
   # performs application management (checkpoint / rollback / console)
   def self.manage(app_name, instance_name, action = :checkpoint)
     instance_magic(app_name, instance_name) do |app, instance|
@@ -58,11 +72,11 @@ module RailsPwnage::App
         when :checkpoint
           ClusterConfig.new.manage app, instance, action
           Svn.new.manage app, instance, action
-          ClusterConfig.new.update app, instance do          
+          self.update_app app, instance do          
             Database.new.manage app, instance, action
           end
         when :rollback
-          ClusterConfig.new.update app, instance do
+          self.update_app app, instance do
             [Svn, Database, ClusterConfig].each do |mod|
               mod.new.manage app, instance, action
             end
@@ -80,11 +94,15 @@ module RailsPwnage::App
     case action
     when :start
       Database.new.control_all :start
+      Scripts.new.control_all :pre_start
       ClusterConfig.new.control_all :start
       NginxConfig.new.control_all :start
+      Scripts.new.control_all :post_start
     when :stop
+      Scripts.new.control_all :pre_stop
       NginxConfig.new.control_all :stop
       ClusterConfig.new.control_all :stop
+      Scripts.new.control_all :post_stop
       Database.new.control_all :stop
     end
   end

data/lib/pwnage/app/scripts.rb

@@ -0,0 +1,72 @@
+# runs custom scripts on app events
+
+class RailsPwnage::App::Scripts
+  include RailsPwnage::Base
+  
+  def run_script(app_name, instance_name, script_name)
+    app_config = RailsPwnage::Config[app_name, instance_name]    
+    pwnerer_user = app_config[:pwnerer_user]
+    pwnerer_uid = uid_for_username(pwnerer_user)
+    pwnerer_gid = gid_for_username(pwnerer_user)
+        
+    return unless app_path = app_config[:app_path]  
+    
+    Dir.chdir app_path do
+      script_file = Dir.glob(File.join('script/rails_pwnerer', script_name + '*')).first
+      return if script_file.nil?
+      # make sure the script is executable
+      mode = File.stat(script_file).mode
+      File.chmod((mode | 0100) & 0777, script_file)
+      File.chown(pwnerer_uid, pwnerer_gid, script_file)
+      
+      # run the script under the app's user
+      pid = Process.fork do
+        Process.uid = pwnerer_uid        
+        Process.gid = pwnerer_gid
+        Process.egid = pwnerer_gid
+        Process.euid = pwnerer_uid
+        Dir.chdir app_path do
+          script_prefix = (script_file[0] == ?/) ? '' : './'
+          Kernel.system %Q|#{script_prefix}#{script_file} "#{app_name}" "#{instance_name}"|
+        end
+      end
+      Process.wait pid
+    end
+  end
+  
+  def setup(app_name, instance_name)
+    run_script app_name, instance_name, 'setup'
+  end
+  
+  def update(app_name, instance_name)
+    run_script app_name, instance_name, 'update'
+  end
+
+  def remove(app_name, instance_name)
+    run_script app_name, instance_name, 'remove'
+  end
+
+  def pre_start(app_name, instance_name)
+    run_script app_name, instance_name, 'pre_start'
+  end
+  def post_start(app_name, instance_name)
+    run_script app_name, instance_name, 'post_start'
+  end
+  def pre_stop(app_name, instance_name)
+    run_script app_name, instance_name, 'pre_stop'
+  end
+  def post_stop(app_name, instance_name)
+    run_script app_name, instance_name, 'post_stop'
+  end
+
+  def control_all(action)
+    RailsPwnage::Config.all_applications.each do |ai|
+      run_script ai[0], ai[1], (case action
+      when :pre_start then 'pre_start'
+      when :post_start then 'post_start'
+      when :pre_stop then 'pre_stop'
+      when :post_stop then 'post_stop'
+      end)
+    end 
+  end
+end

data/lib/pwnage/util/kill_process_set.rb

@@ -0,0 +1,52 @@
+module RailsPwnage::Util
+  # Complex procedure for killing a process or a bunch of process replicas
+  # kill_command is the script that's supposed to kill the process / processes (tried first)
+  # pid_patters are globs identifying PID files (a file can match any of the patterns)
+  # process_patterns are strings that should show on a command line (a process must match all)  
+  # options:
+  #   :verbose - display what gets killed
+  #   :script_delay - the amount of seconds to sleep after launching the kill script
+  #   :force_script - the kill script is executed even if there are no PID files
+  def self.kill_process_set(kill_script, pid_patterns, process_patterns, options = {})
+    # Phase 1: kill order (only if there's a PID file)
+    pid_patterns = [pid_patterns] unless pid_patterns.kind_of? Enumerable
+    unless options[:force_script]
+      pid_files = pid_patterns.map { |pattern| Dir.glob(pattern) }.flatten 
+      unless pid_files.empty?
+        Kernel.system kill_script unless kill_script.nil?
+        sleep options[:script_delay] || 0.5
+      end
+    end
+    
+    # Phase 2: look through PID files and issue kill orders
+    pinfo = process_info()
+    pid_files = pid_patterns.map { |pattern| Dir.glob(pattern) }.flatten 
+    pid_files.each do |fname|
+      begin
+        pid = File.open(fname, 'r') { |f| f.read.strip! }
+        process_cmdline = pinfo[pid][:cmdline]
+        # avoid killing innocent victims
+        if pinfo[pid].nil? or process_patterns.all? { |pattern| process_cmdline.index pattern } 
+          print "Killing #{pid}: #{process_cmdline}\n"
+          Process.kill 'TERM', pid.to_i
+        end
+      rescue
+        # just in case the file gets wiped before we see it
+      end
+      begin
+        print "Deleting #{fname}\n"
+        File.delete fname if File.exists? fname
+      rescue
+        # prevents crashing if the file is wiped after we call exists?
+      end
+    end
+    
+    # Phase 3: look through the process table and kill anything that looks good
+    pinfo = process_info()
+    pinfo.each do |pid, info|
+      next unless process_patterns.all? { |pattern| info[:cmdline].index pattern }
+      print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n"
+      Process.kill 'TERM', pid.to_i
+    end
+  end    
+end

data/lib/pwnage/util/main.rb

@@ -0,0 +1,5 @@
+module RailsPwnage::Util
+  class << self
+    include RailsPwnage::Base
+  end  
+end

data/lib/rails_pwnerer.rb

@@ -21,6 +21,9 @@ require 'pwnage/base/process.rb'
 require 'pwnage/base/rails.rb'
 require 'pwnage/base/startup.rb'
 
+require 'pwnage/util/main.rb'
+require 'pwnage/util/kill_process_set.rb'
+
 require 'pwnage/config/app.rb'
 require 'pwnage/config/main.rb'
 require 'pwnage/config/paths.rb'
@@ -44,6 +47,7 @@ require 'pwnage/app/cluster_config.rb'
 require 'pwnage/app/database.rb'
 require 'pwnage/app/gems.rb'
 require 'pwnage/app/nginx_config.rb'
+require 'pwnage/app/scripts.rb'
 require 'pwnage/app/svn.rb'
 
 require 'pwnage/ctl_executor.rb'

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.16
+# Gem::Specification for Rails_pwnerer-0.5.17
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-08-25 00:00:00 -04:00
+date: 2008-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - lib/pwnage/app/gems.rb
 - lib/pwnage/app/main.rb
 - lib/pwnage/app/nginx_config.rb
+- lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
 - lib/pwnage/base/dirs.rb
@@ -72,6 +73,8 @@ extra_rdoc_files:
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
 - lib/pwnage/scaffolds/sshd.rb
+- lib/pwnage/util/kill_process_set.rb
+- lib/pwnage/util/main.rb
 - lib/rails_pwnerer.rb
 - LICENSE
 - README
@@ -86,6 +89,7 @@ files:
 - lib/pwnage/app/gems.rb
 - lib/pwnage/app/main.rb
 - lib/pwnage/app/nginx_config.rb
+- lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
 - lib/pwnage/base/dirs.rb
@@ -114,6 +118,8 @@ files:
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
 - lib/pwnage/scaffolds/sshd.rb
+- lib/pwnage/util/kill_process_set.rb
+- lib/pwnage/util/main.rb
 - lib/rails_pwnerer.rb
 - LICENSE
 - Manifest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-25 00:00:00 -04:00
+date: 2008-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ extra_rdoc_files:
 - lib/pwnage/app/gems.rb
 - lib/pwnage/app/main.rb
 - lib/pwnage/app/nginx_config.rb
+- lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
 - lib/pwnage/base/dirs.rb
@@ -69,6 +70,8 @@ extra_rdoc_files:
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
 - lib/pwnage/scaffolds/sshd.rb
+- lib/pwnage/util/kill_process_set.rb
+- lib/pwnage/util/main.rb
 - lib/rails_pwnerer.rb
 - LICENSE
 - README
@@ -83,6 +86,7 @@ files:
 - lib/pwnage/app/gems.rb
 - lib/pwnage/app/main.rb
 - lib/pwnage/app/nginx_config.rb
+- lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
 - lib/pwnage/base/dirs.rb
@@ -111,6 +115,8 @@ files:
 - lib/pwnage/scaffolds/packages.rb
 - lib/pwnage/scaffolds/rubygems.rb
 - lib/pwnage/scaffolds/sshd.rb
+- lib/pwnage/util/kill_process_set.rb
+- lib/pwnage/util/main.rb
 - lib/rails_pwnerer.rb
 - LICENSE
 - Manifest