rails_pwnerer 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.3. Better control of mongrels using the process table and configuration database.
+
 v0.5.2. Extracts per-app and per-instance configuration from the application dir.
 
 v0.5.1. Application instances with per-instance configuration.

data/lib/pwnage/app/cluster_config.rb

@@ -57,6 +57,38 @@ class RailsPwnage::App::ClusterConfig
     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 } 
+            Process.kill 'TERM', pid.to_i
+          end
+        rescue
+          # just in case the file gets wiped before we see it
+        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 }
+        Process.kill 'TERM', pid.to_i
+      end
+    end
+  end
+  
   def stop_mongrels(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
     # silently die if the app was completely busted
@@ -64,16 +96,17 @@ class RailsPwnage::App::ClusterConfig
     
     Dir.chdir app_config[:app_path] do
       system 'mongrel_rails cluster::stop'
-      
-      # clean up PID files in case the mongrels died and left them behind
-      Dir.glob('tmp/pids/*.pid').each { |f| File.delete(f) }
     end
+    sleep 0.5
+    kill_stray_mongrels app_name, instance_name
   end
   
   def start_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]
+
+    kill_stray_mongrels app_name, instance_name
     
     # alloc a port if somehow that slipped through the cracks
     if app_config[:port0] == 0
@@ -119,11 +152,13 @@ class RailsPwnage::App::ClusterConfig
   end
   
   def control_all(action)
-    case action
-    when :start
-      control_boot_script('mongrel_cluster', :start)
-    when :stop
-      control_boot_script('mongrel_cluster', :stop)
-    end
+    RailsPwnage::Config.all_applications.each do |ai|
+      case action
+      when :start
+        RailsPwnage::App::ClusterConfig.new.start_mongrels ai[0], ai[1]
+      when :stop
+        RailsPwnage::App::ClusterConfig.new.stop_mongrels ai[0], ai[1]        
+      end
+    end 
   end  
 end

data/lib/pwnage/app/main.rb

@@ -73,7 +73,6 @@ module RailsPwnage::App
   def self.control_all(action = :start)
     case action
     when :start
-      control_all :stop
       Database.new.control_all :start
       ClusterConfig.new.control_all :start
       NginxConfig.new.control_all :start

data/lib/pwnage/config/app.rb

@@ -8,6 +8,14 @@ module RailsPwnage::Config
   
   # the instances of an application installed on this box
   def self.app_instances(app_name)
-    self.databases().filter { |db| db.include? ?. }.map { |db| db[0..(db.rindex ?.)] }
+    self.databases().select { |db| db.include? ?. }.map { |db| db[0...(db.rindex ?.)] }
+  end
+  
+  # all instances of all applications installed on this box
+  def self.all_applications()
+    self.databases().select { |db| db.include? ?. }.map do |db|
+      lastdot = db.rindex ?.
+      [db[0...lastdot], db[(lastdot + 1)..-1]]
+    end
   end
 end

data/lib/pwnage/scaffolds/gems.rb

@@ -17,6 +17,9 @@ class RailsPwnage::Scaffolds::Gems
   end
   
   def install_tools
+    # we need this to do controlled mongrel startups
+    install_gems %w(sys-proctable)
+    
     # TODO: an application should have its own tools
     install_gems %w(highline echoe)
   end

data/lib/rails_pwnage.rb

@@ -17,6 +17,7 @@ require 'pwnage/base/dirs.rb'
 require 'pwnage/base/gems.rb'
 require 'pwnage/base/hostname.rb'
 require 'pwnage/base/packages.rb'
+require 'pwnage/base/process.rb'
 require 'pwnage/base/startup.rb'
 
 require 'pwnage/config/app.rb'

data/rails_pwnerer.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.2
+# Gem::Specification for Rails_pwnerer-0.5.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Victor Costan

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Victor Costan