rails_pwnerer 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.5. Faster killing in kill_process_set, plus now it honors the :verbose option.
+
 v0.6.4. Added configuration variable for the environment. Switched to a more determinstic config update model.
 
 v0.6.3. Bugfix: scaffolding "forgot" to install database gems.

data/lib/pwnage/app/config.rb

@@ -8,11 +8,13 @@ class RailsPwnage::App::Config
   # setup: this effectively creates the baseline configuration db
   # update: this adds keys that might have been added in new versions of rpwn
   def populate_defaults(app_name, instance_name, app_db)
+    # the path to application main files
+    app_db[:app_path] = File.join(RailsPwnage::Config.path_to(:apps), app_name + '.' + instance_name)
     # the path to application backups
     app_db[:backup_path] ||= File.join(RailsPwnage::Config.path_to(:backups), app_name + '.' + instance_name)
     
     # the user which will receive the "keys" to the production system 
-    app_db[:pwnerer_user] ||= 'victor'    
+    app_db[:pwnerer_user] ||= RailsPwnage::Config[:host][:pwnerer_user]
     # the number of frontends for the application instance
     app_db[:frontends] ||= 4
     # the first internal port for the application instance
@@ -39,25 +41,21 @@ class RailsPwnage::App::Config
 
   # allocates room for the application and creates the application configuration database
   def alloc(app_name, instance_name)
-    app_path = File.join(RailsPwnage::Config.path_to(:apps), app_name + '.' + instance_name)
-    FileUtils.mkpath app_path
-
     app_db_name = RailsPwnage::Config.app_db_name(app_name, instance_name)
     app_db = RailsPwnage::Config.create_db app_db_name
-    
-    # default settings    
-    app_db[:app_path] = app_path    
     populate_defaults app_name, instance_name, app_db
+    
+    FileUtils.mkpath app_db[:app_path]
         
     RailsPwnage::Config.flush_db app_db    
-    return app_path
+    return app_db[:app_path]
   end
       
   # pushes config changes from the application file to the database
   def update(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
     app_config.clear
-    populate_defaults app_name, instance_name, app_db
+    populate_defaults app_name, instance_name, app_config
     Dir.chdir app_config[:app_path] do
       ["config/rails_pwnerer/.yml", "config/rails_pwnerer/#{instance_name}.yml"].each do |fname|
         next unless File.exists? fname

data/lib/pwnage/util/kill_process_set.rb

@@ -11,10 +11,20 @@ module RailsPwnage::Util
     # 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
+      pid_files = pid_patterns.map { |pattern| Dir.glob(pattern) }.flatten
+    end
+    if options[:force_script] or !(pid_files.empty? or kill_script.nil?)
+      print "Issuing kill order: #{kill_script}\n" if options[:verbose]
+      success = Kernel.system kill_script unless kill_script.nil?
+      if !success and options[:verbose]
+        print "Kill order failed with exit code #{$CHILD_STATUS.exitstatus}\n"
+      end
+      
+      deadline_time = Time.now + (options[:script_delay] || 0.5)
+      while Time.now < deadline_time
+        pid_files = pid_patterns.map { |pattern| Dir.glob(pattern) }.flatten
+        break if pid_files.empty?
+        sleep 0.05
       end
     end
     
@@ -27,14 +37,14 @@ module RailsPwnage::Util
         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"
+          print "Killing #{pid}: #{process_cmdline}\n" if options[:verbose]
           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"
+        print "Deleting #{fname}\n" if options[:verbose]
         File.delete fname if File.exists? fname
       rescue
         # prevents crashing if the file is wiped after we call exists?
@@ -45,8 +55,8 @@ module RailsPwnage::Util
     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"
+      print "Killing #{pid}: #{pinfo[pid][:cmdline]}\n" if options[:verbose]
       Process.kill 'TERM', pid.to_i
     end
-  end    
-end
+  end
+end

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.6.4
+# Gem::Specification for Rails_pwnerer-0.6.5
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-09-19 00:00:00 -04:00
+date: 2008-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-19 00:00:00 -04:00
+date: 2008-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency