Switched to using Puma as the app server.

4 files changed, 20 insertions, 15 deletions

diff --git a/Capfile b/Capfile
index 6ad9a5a..604eec8 100644
--- a/Capfile
+++ b/Capfile
@@ -5,6 +5,7 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 require 'capistrano/rbenv'
 require 'capistrano/bundler'
+require 'capistrano/puma'
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 
@@ -17,4 +18,4 @@ namespace :deploy do
 end
 
 # Load custom tasks from `lib/capistrano/tasks' if you have any defined
-Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
\ No newline at end of file
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index 09f297d..690d7fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,9 +31,10 @@ group :development do
   gem 'binding_of_caller'
   gem 'rails-erd'
   # deploy with capistrano
-  gem 'capistrano-rails', '~> 1.1.2'
-  gem 'capistrano-rbenv', '~> 2.0'
-  gem 'capistrano-bundler', '~> 1.1.3'
+  gem 'capistrano-rails'
+  gem 'capistrano-rbenv'
+  gem 'capistrano-bundler'
+  gem 'capistrano-puma'
   # windows timezone foo
   gem 'tzinfo-data', platforms: [:mingw, :mswin]
 end
@@ -43,6 +44,6 @@ group :test do
 end
 
 group :production do
-  # Use unicorn as the app server
-  gem 'unicorn'
+  # Use puma as the app server
+  gem 'puma'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index bd8feba..e070a80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,6 +115,8 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
+    capistrano-puma (0.2.3)
+      capistrano (>= 3.0)
     capistrano-rails (1.1.8)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
@@ -156,7 +158,6 @@ GEM
       coffee-rails (>= 3.2.0)
       railties (>= 3.2.0)
       sass-rails (>= 3.2.0)
-    kgio (2.11.2)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -178,6 +179,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
+    puma (3.11.4)
     rack (1.6.9)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -194,7 +196,6 @@ GEM
       ruby-graphviz (~> 1.2)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    raindrops (0.19.0)
     rake (12.3.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -244,9 +245,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicorn (5.4.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
     webrick (1.4.2)
 
 PLATFORMS
@@ -258,9 +256,10 @@ DEPENDENCIES
   bcrypt
   better_errors
   binding_of_caller
-  capistrano-bundler (~> 1.1.3)
-  capistrano-rails (~> 1.1.2)
-  capistrano-rbenv (~> 2.0)
+  capistrano-bundler
+  capistrano-puma
+  capistrano-rails
+  capistrano-rbenv
   highlight_js-rails!
   hirb
   jquery-rails
@@ -268,6 +267,7 @@ DEPENDENCIES
   kaminari!
   mail-gpg!
   mysql2
+  puma
   rails!
   rails-erd
   rb-readline
@@ -279,7 +279,6 @@ DEPENDENCIES
   strip_attributes
   tzinfo-data
   uglifier
-  unicorn
   webrick
 
 BUNDLED WITH
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 0000000..8e0624c
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,4 @@
+workers = 2
+threads 2, 4
+
+preload_app!