rails_pwnerer 0.6.22 → 0.6.23

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.23. Implemented frontends_per_core option as an alternative to frontends.
+
 v0.6.22. Fixed package name for git.
 
 v0.6.21. Mass-upgrade to all packages at the end of scaffolding.

data/Manifest

@@ -12,6 +12,7 @@ lib/pwnage/app/nginx_config.rb
 lib/pwnage/app/scripts.rb
 lib/pwnage/app/svn.rb
 lib/pwnage/base/atomics.rb
+lib/pwnage/base/cpus.rb
 lib/pwnage/base/dirs.rb
 lib/pwnage/base/gems.rb
 lib/pwnage/base/hostname.rb

data/README

@@ -119,12 +119,12 @@ overrides will be version-controlled). In your Rails directory
 * Set the DNS name that your app responds to:
 rpwndev set dns-name your.dns.name
 
-* Tweak the number of frontends for an instance:
-rpwndev setnum frontends 8 your_instance
+* Tweak the number of frontends per CPU core for an instance:
+rpwndev setnum frontends_per_core 4 your_instance
 
 * Delete the previous tweak and apply it to all instances:
-rpwndev del frontends your_instance;
-rpwndev setnum frontends
+rpwndev del frontends_per_core your_instance;
+rpwndev setnum frontends_per_core 4
 
 The overrides are YAML files in +config/rails_pwnage+, so you
 can view and edit them by hand. rpwndev is just a handy tool,

data/lib/pwnage/app/cluster_config.rb

@@ -24,16 +24,28 @@ class RailsPwnage::App::ClusterConfig
     end
   end
   
+  # computes the number of frontends to bring up / down
+  def num_frontends(app_name, instance_name)    
+    app_config = RailsPwnage::Config[app_name, instance_name]
+    return nil unless app_config and fixed_frontends = app_config[:frontends]
+
+    if app_config[:frontends_per_core]
+      cores_frontends = app_config[:frontends_per_core] * app_config[:detected_cores]
+      return cores_frontends unless cores_frontends == 0
+    end
+    return fixed_frontends
+  end
+  
   def manage_ports(app_name, instance_name, action)
     app_config = RailsPwnage::Config[app_name, instance_name]
-    return unless app_config and app_config[:port0] and app_config[:frontends]
+    return unless frontends = num_frontends(app_name, instance_name)
     
     case action
     when :alloc
-      app_config[:port0] = RailsPwnage::Config.alloc_ports app_config[:frontends]
+      app_config[:port0] = RailsPwnage::Config.alloc_ports frontends
     when :free
+      RailsPwnage::Config.free_ports app_config[:port0], frontends
       return if app_config[:port0] == 0 # do not release if ports have already been released
-      RailsPwnage::Config.free_ports app_config[:port0], app_config[:frontends]
       app_config[:port0] = 0
     end
     RailsPwnage::Config.flush_db RailsPwnage::Config.app_db_name(app_name, instance_name)
@@ -45,7 +57,7 @@ class RailsPwnage::App::ClusterConfig
     return unless app_config and File.exists? app_config[:app_path]
         
     app_path = app_config[:app_path]
-    frontends, first_port = app_config[:frontends], app_config[:port0]
+    frontends, first_port = num_frontends(app_name, instance_name), app_config[:port0]
 
     cmdline_patterns = ['thin', nil]
     
@@ -69,7 +81,7 @@ class RailsPwnage::App::ClusterConfig
 
     app_path, pwnerer_user = app_config[:app_path], app_config[:pwnerer_user]
     pwnerer_group = group_for_username(pwnerer_user)    
-    frontends, first_port = app_config[:frontends], app_config[:port0]
+    frontends, first_port = num_frontends(app_name, instance_name), app_config[:port0]
     environment = app_config[:environment]
 
     stop app_name, instance_name

data/lib/pwnage/app/config.rb

@@ -8,7 +8,7 @@ class RailsPwnage::App::Config
     (0...16).map { |i| "abcdefghijklmnopqrstuvwxyz"[rand(26),1]}.join
   end
 
-  # fills inexsitent keys with their default values
+  # fills inexistent keys with their default values
   # 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)
@@ -16,11 +16,13 @@ class RailsPwnage::App::Config
     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] ||= RailsPwnage::Config[:host][:pwnerer_user]
     # the number of frontends for the application instance
-    app_db[:frontends] ||= 4
+    app_db[:frontends] ||= 4 # most computers have 2 cores nowadays
+    # the number of frontends per core for the application instance
+    app_db[:frontends_per_core] ||= 2 # best practice
     # the first internal port for the application instance
     app_db[:port0] = 0  # will be overwritten during allocation
     # the name of the database for the application instance 
@@ -43,6 +45,9 @@ class RailsPwnage::App::Config
     app_db[:gems] ||= ''
     # set to disable accidental db resets (on production vs. staging instances)
     app_db[:enable_db_reset] ||= false
+    
+    # the number of cores on the platform
+    app_db[:detected_cores] ||= cpu_cores.count
   end
 
   # allocates room for the application and creates the application configuration database

data/lib/pwnage/base/cpus.rb

@@ -0,0 +1,62 @@
+if File.exists? '/proc/cpuinfo'
+  # safest option: emulate Sys::CPU based on procfs
+  module Sys; end
+
+  module Sys::CPU
+    def self.processors
+      cpuinfo_text = File.read '/proc/cpuinfo'
+      cpus_text = cpuinfo_text.split "\n\n"
+      cpus = []
+      cpus_text.each do |cpu_text|
+        cpu = {}
+        cpu_text.each_line do |cpu_line|
+          key, value = *cpu_line.split(':', 2)
+          key.strip!
+          key.gsub! /\s/, '_'
+          key.downcase!
+          value.strip!
+          cpu[key.to_sym] = value
+        end
+        cpus << Struct.new(*cpu.keys).new(*cpu.values)
+      end
+      
+      cpus.each { |cpu| yield cpu } if Kernel.block_given?
+      return cpus
+    end
+  end
+  
+else
+  # no procfs, try to use sys-cpu
+  
+  begin
+    require 'rubygems'
+    require 'sys/cpu'
+  rescue      
+    # no gem either, stub sys-cpu
+    module Sys; end
+      
+    module Sys::CPU
+      def self.processors
+        return []
+      end
+    end
+  end
+  
+end
+
+module RailsPwnage::Base
+  # returns information for each core in the system
+  def cpu_cores
+    cpus = []
+    Sys::CPU.processors do |p|
+      cpus << {
+          :freq => p.cpu_mhz.to_f,
+          :id => p.processor.to_i,
+          :cpu => p.physical_id.to_i,
+          :core => p.core_id.to_i,
+          :num_cores => p.cpu_cores.to_i
+      }
+    end
+    return cpus
+  end
+end

data/lib/pwnage/scaffolds/gems.rb

@@ -20,8 +20,11 @@ class RailsPwnage::Scaffolds::Gems
     # we need this to do controlled app container startups
     install_gems %w(sys-proctable)
     
-    # TODO: an application should have its own tools
-    install_gems %w(highline echoe)
+    # used to determine the number of available CPUs and cores
+    install_gems %w(sys-cpu)
+    
+    # useful for building gems and debugging
+    install_gems %w(highline echoe)    
   end
   
   # runner

data/lib/pwnage/scaffolds/packages.rb

@@ -14,7 +14,7 @@ class RailsPwnage::Scaffolds::Packages
     # should work from source, except package author decided to block that
     install_packages %w(subversion)
     
-    # rpwn doesn't deal with git yes, but we'd like to offer that, so we'll
+    # rpwn doesn't deal with git yet, but we'd like to offer that, so we'll
     # bring in the git infrastructure during scaffolding
     install_packages %w(git-core), :source => true
 

data/lib/rails_pwnerer.rb

@@ -13,6 +13,7 @@ end
 
 require 'pwnage/base.rb'
 require 'pwnage/base/atomics.rb'
+require 'pwnage/base/cpus.rb'
 require 'pwnage/base/dirs.rb'
 require 'pwnage/base/gems.rb'
 require 'pwnage/base/hostname.rb'

data/rails_pwnerer.gemspec

@@ -1,30 +1,32 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.22"
+  s.version = "0.6.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2008-11-08}
+  s.date = %q{2008-12-31}
   s.default_executable = %q{bin/rpwn}
   s.description = %q{Rails deployment tool/hack.}
   s.email = %q{victor@costan.us}
   s.executables = ["rpwn", "rpwnctl", "rpwndev"]
   s.extensions = ["ext/rpwn_setup_notice/extconf.rb"]
-  s.extra_rdoc_files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "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", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "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", "README"]
-  s.files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "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", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "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", "Rakefile", "README", "RUBYFORGE", "rails_pwnerer.gemspec"]
+  s.extra_rdoc_files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "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/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "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", "README"]
+  s.files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "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/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "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", "Rakefile", "README", "RUBYFORGE", "rails_pwnerer.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://www.costan.us/rails_pwnage}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rails_pwnerer", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{rails-pwnage}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Rails deployment tool/hack.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<echoe>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.22
+  version: 0.6.23
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-08 00:00:00 -05:00
+date: 2008-12-31 00:00:00 -05:00
 default_executable: bin/rpwn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extra_rdoc_files:
 - lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
+- lib/pwnage/base/cpus.rb
 - lib/pwnage/base/dirs.rb
 - lib/pwnage/base/gems.rb
 - lib/pwnage/base/hostname.rb
@@ -91,6 +92,7 @@ files:
 - lib/pwnage/app/scripts.rb
 - lib/pwnage/app/svn.rb
 - lib/pwnage/base/atomics.rb
+- lib/pwnage/base/cpus.rb
 - lib/pwnage/base/dirs.rb
 - lib/pwnage/base/gems.rb
 - lib/pwnage/base/hostname.rb
@@ -154,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails-pwnage
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Rails deployment tool/hack.