h2ocube_rails_puma 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069c801dbb866f1a321bed6d309cb2f8a9793364
-  data.tar.gz: 54f420666e902f62146d1fa364417605e51d1f5a
+  metadata.gz: da3bb6f5824867cf585d7a261927049dddc19cef
+  data.tar.gz: cc732dec6ae17683fc68d6944fe1f68cb3703be2
 SHA512:
-  metadata.gz: 56e0d47169d77cc8635f854337f062f62797a8126d4703c883331d9eaf1974e371ffc3eea6f93e0ab97dc34a2aaf8d9d9e61cc2ceb2c12f560d90b1514c5cab3
-  data.tar.gz: 6c68514391a440f0de601d3bd28b2e73835c2ccf08589ec803d1ed2f517f20418e8b659469fa27609922028f155bed83fe197317797cb2e3dd822ae62d00a0f0
+  metadata.gz: 9d510bda50ff4721cab33d6741e5f0bcce610fe3e85b02f6ecc10fe8d28a12e61878a1add68db7ec6ef8296de810fbe9f6045dbc4e0d307acf8b9798bb611121
+  data.tar.gz: ce13bd9124817d603b1e1e2379064eeb7e9c7a4bd3f2fecb140b9a99366912e1369c7fc2db8798a3ed019f53e8ebea890bbb8cef90949e1c1a8a7525262e44fc

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+.bundle

data/README.md

@@ -8,7 +8,7 @@ Puma helper.
 
 Add this line to your application's Gemfile:
 
-    gem 'h2ocube_rails_puma', group: [:development, :production]
+    gem 'h2ocube_rails_puma'
 
 And then execute:
 
@@ -20,31 +20,19 @@ Or install it yourself as:
 
 ## Usage
 
-    # generate config/puma.rb
+    # generate config/deploy/templates/puma.rb.erb
     rails g h2ocube_rails_puma
 
     # Capfile
     require 'capistrano/puma'
 
-    # deploy.rb
-    set :puma_rb, 'config/puma.rb'
-    set :puma_threads, '0:16'
-    set :puma_workers, '2'
-
-Puma specific tasks for Capistrano v3:
-
-    cap puma:start
-    cap puma:stop
-    cap puma:restart
-    cap puma:phased_restart
-    cap puma:cold_restart
-
     # nginx.conf
     upstream app {
       server unix:/root/app/shared/sockets/puma.sock fail_timeout=0;
     }
     server {
       listen 80;
+      listen [::]:80;
       server_name app.com;
       root /root/app/current/public;
       location / {
@@ -58,6 +46,7 @@ Puma specific tasks for Capistrano v3:
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_set_header X-UA-Compatible IE=edge,chrome=1;
+        proxy_http_version 1.1;
         proxy_redirect off;
         proxy_pass http://app;
       }
@@ -66,6 +55,8 @@ Puma specific tasks for Capistrano v3:
 ## Include
 
 * puma https://github.com/puma/puma
+* puma_worker_killer https://github.com/schneems/puma_worker_killer
+* capistrano3-puma https://github.com/seuros/capistrano-puma
 
 ## Contributing
 

data/h2ocube_rails_puma.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'h2ocube_rails_puma'
-  spec.version       = '0.0.7'
+  spec.version       = '0.1.0'
   spec.authors       = ['Ben']
   spec.email         = ['ben@zfben.com']
   spec.description   = 'Puma plugin for Rails and Capistrano'
@@ -18,4 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'puma'
+  spec.add_dependency 'puma_worker_killer'
+  spec.add_dependency 'capistrano3-puma'
 end

data/lib/generators/h2ocube_rails_puma_generator.rb

@@ -1,9 +1,9 @@
 class H2ocubeRailsPumaGenerator < Rails::Generators::Base
   source_root File.expand_path('../source', __FILE__)
 
-  desc 'Creates a puma.rb to your config/.'
+  desc 'Creates puma.rb.erb to your config/deploy/templates/.'
 
   def copy_puma_rb
-    template 'puma.rb.erb', 'config/puma.rb'
+    copy_file 'puma.rb.erb', 'config/deploy/templates/puma.rb.erb'
   end
 end

data/lib/generators/source/puma.rb.erb

@@ -1,11 +1,66 @@
-application_path = File.expand_path('../../', __FILE__)
+#!/usr/bin/env puma
 
-stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+directory '<%= current_path %>'
+rackup "<%=fetch(:puma_rackup)%>"
+environment '<%= fetch(:puma_env) %>'
+<% if fetch(:puma_tag) %>
+  tag '<%= fetch(:puma_tag)%>'
+<% end %>
+pidfile "<%=fetch(:puma_pid)%>"
+state_path "<%=fetch(:puma_state)%>"
+stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', true
 
+
+threads <%=fetch(:puma_threads).join(',')%>
+
+<%= puma_plugins %>
+
+<%= puma_bind %>
+<% if fetch(:puma_control_app) %>
+activate_control_app "<%= fetch(:puma_default_control_app) %>"
+<% end %>
+workers <%= puma_workers %>
+<% if fetch(:puma_worker_timeout) %>
+worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
+<% end %>
+
+<% if puma_daemonize? %>
+daemonize
+<% end %>
+
+<% if puma_preload_app? %>
 preload_app!
+<% else %>
+prune_bundler
+<% end %>
+
+on_restart do
+  puts 'Refreshing Gemfile'
+  ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
+end
+
+<% if puma_preload_app? and fetch(:puma_init_active_record) %>
+before_fork do
+  ActiveRecord::Base.connection_pool.disconnect!
+
+  if RUBY_PLATFORM.match?(/linux/)
+    require 'puma_worker_killer'
+
+    PumaWorkerKiller.config do |config|
+      config.ram           = (`free`.lines.to_a[1].split[1].to_i / 1024).to_i
+      config.frequency     = 30
+      config.percent_usage = 0.5
+      config.rolling_restart_frequency = 8 * 3600
+      config.reaper_status_logs = true
+    end
+
+    PumaWorkerKiller.start
+  end
+end
 
 on_worker_boot do
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Base.establish_connection
   end
 end
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_puma
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma_worker_killer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano3-puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Puma plugin for Rails and Capistrano
 email:
 - ben@zfben.com
@@ -32,14 +60,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".bundle/install.log"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - h2ocube_rails_puma.gemspec
-- lib/capistrano/puma.rb
-- lib/capistrano/tasks/puma.cap
 - lib/generators/h2ocube_rails_puma_generator.rb
 - lib/generators/source/puma.rb.erb
 - lib/h2ocube_rails_puma.rb
@@ -63,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Puma plugin for Rails and Capistrano

data/lib/capistrano/puma.rb

@@ -1 +0,0 @@
-load File.expand_path('../tasks/puma.cap', __FILE__)

data/lib/capistrano/tasks/puma.cap

@@ -1,54 +0,0 @@
-set :puma_rb, 'config/puma.rb'
-set :puma_threads, '0:16'
-set :puma_workers, '2'
-
-namespace :puma do
-  desc 'Start puma'
-  task :start do
-    on roles :app do
-      within release_path do
-        execute :bundle, "exec puma -C #{fetch :puma_rb} -b 'unix://#{shared_path}/sockets/puma.sock' -t #{fetch :puma_threads} -w #{fetch :puma_workers} --pidfile #{shared_path}/pids/puma.pid -S #{state_path} -e #{fetch :stage} -d"
-      end
-    end
-  end
-
-  desc 'Stop puma'
-  task :stop do
-    on roles :app do
-      within release_path do
-        execute :bundle, "exec pumactl -S #{state_path} stop;true"
-      end
-    end
-  end
-
-  desc 'Restart puma'
-  task :restart do
-    on roles :app do
-      within release_path do
-        execute :bundle, "exec pumactl -S #{state_path} restart;true"
-      end
-    end
-  end
-
-  desc 'Phased restart puma'
-  task :phased_restart do
-    on roles :app do
-      within release_path do
-        execute :bundle, "exec pumactl -S #{state_path} phased-restart;true"
-      end
-    end
-  end
-
-  desc 'Cold Restart puma'
-  task :cold_restart do
-    invoke 'puma:stop'
-    sleep 1
-    invoke 'puma:start'
-  end
-
-  def state_path
-    "#{shared_path}/sockets/puma.state"
-  end
-
-  before 'deploy:published', 'puma:cold_restart'
-end