rails_pwnerer 0.5.19 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.0. Replaced mongrel with thin, for better performance.
+
 v0.5.19. Bugfix: the nginx configuration is set up for static serving out of public/
 
 v0.5.18. Bugfix: removal scripts are called at the right time too.

data/README

@@ -19,8 +19,9 @@ Read a couple more 20-page guides, and learn to push newer versions
 of your application. You'll become lazy, and take shortcuts, like having 
 production passwords in the repository, or insecure file permissions, or
 you'll forget to delete cached javascripts and stylesheets from public/.
-I won't even mention backups. Or scripts to recover your mongrels
-properly from power outages. Or a staging server of your application.
+I won't even mention backups. Or scripts to recover your frontends
+(mongrel / thin) properly from power outages. Or a staging server of your
+application.
 
 Life with +rails_pwnerer+:
 
@@ -109,12 +110,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 mongrels for an instance:
-rpwndev setnum mongrels 8 your_instance
+* Tweak the number of frontends for an instance:
+rpwndev setnum frontends 8 your_instance
 
 * Delete the previous tweak and apply it to all instances:
-rpwndev del mongrels your_instance;
-rpwndev setnum mongrels
+rpwndev del frontends your_instance;
+rpwndev setnum frontends
 
 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

@@ -1,4 +1,4 @@
-# builds the mongrel cluster configuration
+# builds the frontend cluster configuration
 
 require 'fileutils'
 
@@ -26,52 +26,39 @@ class RailsPwnage::App::ClusterConfig
   
   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[:mongrels]
+    return unless app_config and app_config[:port0] and app_config[:frontends]
     
     case action
     when :alloc
-      app_config[:port0] = RailsPwnage::Config.alloc_ports app_config[:mongrels]
+      app_config[:port0] = RailsPwnage::Config.alloc_ports app_config[:frontends]
     when :free
       return if app_config[:port0] == 0 # do not release if ports have already been released
-      RailsPwnage::Config.free_ports app_config[:port0], app_config[:mongrels]
+      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)
   end
 
-
-  def configure_mongrels(app_name, instance_name)
-    app_config = RailsPwnage::Config[app_name, instance_name]
-
-    app_path, pwnerer_user = app_config[:app_path], app_config[:pwnerer_user]
-    pwnerer_group = group_for_username(pwnerer_user)
-    
-    mongrels, first_port = app_config[:mongrels], app_config[:port0]
-    
-    Dir.chdir(app_path) do
-      # create the mongrel_cluster configuration
-      Kernel.system("mongrel_rails cluster::configure -e production" +
-          " -N #{mongrels} -p #{first_port} -a 127.0.0.1 -c #{app_path}" + 
-          " --user #{pwnerer_user} --group #{pwnerer_group}")
-    end
-  end
-  
-  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
-  end
-  
   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']
+    app_path = app_config[:app_path]
+    frontends, first_port = app_config[:frontends], app_config[:port0]
+
+    cmdline_patterns = ['thin', nil]
     
-    Dir.chdir app_config[:app_path] do
-      RailsPwnage::Util.kill_process_set('mongrel_rails cluster::stop',
-        'tmp/pids/*.pid', cmdline_patterns, :verbose => false, :sleep_delay => 0.5)
+    Dir.chdir app_path do
+      # TODO: stop processes in parallel
+      frontends.times do |f|
+        fe_port = first_port + f
+        cmdline = "thin stop -a 127.0.0.1 -p #{fe_port} -d -P tmp/pids/fe.#{fe_port}.pid"
+        cmdline_patterns[1] = "(127.0.0.1:#{fe_port})"
+        RailsPwnage::Util.kill_process_set(cmdline, "tmp/pids/fe.#{fe_port}.pid",
+                           cmdline_patterns, :verbose => false, :sleep_delay => 0.2)
+      end
+      
     end
   end
   
@@ -80,23 +67,34 @@ class RailsPwnage::App::ClusterConfig
     # silently die if the app was completely busted
     return unless app_config and File.exists? app_config[:app_path]
 
+    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]
+
     stop app_name, instance_name
     
     # alloc a port if somehow that slipped through the cracks
-    if app_config[:port0] == 0
+    if first_port == 0
       manage_ports app_name, instance_name, :alloc
-      configure_mongrels app_name, instance_name
+      first_port = app_config[:port0]
       RailsPwnage::App::NginxConfig.new.update app_name, instance_name
     end
     
+    static_cmd = "thin start -a 127.0.0.1 -A rails -c #{app_path} -d -u #{pwnerer_user}" +
+                 " -g #{pwnerer_group} -e production "
+    
+    # TODO: start the servers simultaneously
     Dir.chdir app_config[:app_path] do
-      Kernel.system 'mongrel_rails cluster::start'
-    end    
+      frontends.times do |f|
+        fe_port = first_port + f
+        cmd = static_cmd + "-p #{fe_port} -l logs/fe.#{fe_port}.log -P tmp/pids/fe.#{fe_port}.pid"
+        Kernel.system cmd
+      end
+    end
   end
 
   def setup(app_name, instance_name)
     manage_ports app_name, instance_name, :alloc
-    configure_mongrels app_name, instance_name
     fix_permissions app_name, instance_name
     # no need to configure nginx here, it'll be done by the executor
   end
@@ -106,12 +104,10 @@ class RailsPwnage::App::ClusterConfig
   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
   end
   
   def remove(app_name, instance_name)
-    remove_mongrels app_name, instance_name
     manage_ports app_name, instance_name, :free
   end
   
@@ -120,7 +116,6 @@ class RailsPwnage::App::ClusterConfig
     when :checkpoint
       # nothing to do here
     when :rollback
-      configure_mongrels app_name, instance_name
       fix_permissions app_name, instance_name
     end
   end

data/lib/pwnage/app/config.rb

@@ -19,8 +19,8 @@ class RailsPwnage::App::Config
     
     # the user which will receive the "keys" to the production system 
     app_db[:pwnerer_user] = 'victor'    
-    # the number of mongrel instances for the application instance
-    app_db[:mongrels] = 4
+    # the number of frontends for the application instance
+    app_db[:frontends] = 4
     # 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 

data/lib/pwnage/app/nginx_config.rb

@@ -11,9 +11,9 @@ class RailsPwnage::App::NginxConfig
     
     nginx_config = File.join(RailsPwnage::Config.path_to(:nginx_configs), app_name + '.' + instance_name) 
     File.open(nginx_config, 'w') do |f|
-      # link to the mongrels
+      # link to the frontends
       f << "  upstream #{app_name}_#{instance_name} {\n"
-      app_config[:mongrels].times do |instance|
+      app_config[:frontends].times do |instance|
         f << "    server 127.0.0.1:#{first_port + instance};\n"
       end
       f << "  }\n\n"

data/lib/pwnage/scaffolds/config.rb

@@ -7,8 +7,6 @@ class RailsPwnage::Scaffolds::Config
   def run
     # paths    
     paths_db = RailsPwnage::Config.create_db :paths
-    # the directory containing the mongrel_cluster config files
-    paths_db[:mongrel_configs] = '/etc/mongrel_cluster' 
     # the directory containing the nginx config files
     paths_db[:nginx_configs] = '/etc/nginx/sites-enabled'
     # the directory containing the ddclient configuration

data/lib/pwnage/scaffolds/gems.rb

@@ -9,7 +9,7 @@ class RailsPwnage::Scaffolds::Gems
   end
   
   def install_servers
-    install_gems %w(rails mongrel mongrel_cluster)
+    install_gems %w(rails thin)
   end
   
   def install_dbi
@@ -17,7 +17,7 @@ class RailsPwnage::Scaffolds::Gems
   end
   
   def install_tools
-    # we need this to do controlled mongrel startups
+    # we need this to do controlled app container startups
     install_gems %w(sys-proctable)
     
     # TODO: an application should have its own tools

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.19
+# Gem::Specification for Rails_pwnerer-0.6.0
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.19
+  version: 0.6.0
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-08-30 00:00:00 -04:00
+date: 2008-09-02 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.5.19
+  version: 0.6.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 00:00:00 -04:00
+date: 2008-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency