Merge pull request #1384 from rubymonsters/anja-bring-back-unicorn

move back to unicorn

Gemfile

@@ -52,7 +52,7 @@ gem 'sassc-rails'
 
 gem 'uglifier', '>= 1.0.3'
 
-gem 'puma', '~> 3.4'
+gem 'unicorn', '~> 5.1'
 
 gem 'rack-piwik', '~> 0.3.0', require: 'rack/piwik'
 

Gemfile.lock

@@ -255,6 +255,7 @@ GEM
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     jsonapi-renderer (0.2.2)
+    kgio (2.11.4)
     launchy (2.5.2)
       addressable (~> 2.8)
     letter_opener (1.8.1)
@@ -327,7 +328,6 @@ GEM
       method_source (~> 1.0)
     psych (3.3.3)
     public_suffix (5.0.1)
-    puma (3.12.6)
     racc (1.7.1)
     rack (2.2.6.4)
     rack-attack (6.7.0)
@@ -367,6 +367,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
+    raindrops (0.20.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -450,6 +451,9 @@ GEM
       execjs (>= 0.3.0, < 3)
     unaccent (0.4.0)
     unicode-display_width (1.4.1)
+    unicorn (5.8.0)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
     uniform_notifier (1.16.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -508,7 +512,6 @@ DEPENDENCIES
   poltergeist (= 1.18.1)
   pry
   psych (< 4.0)
-  puma (~> 3.4)
   rack-attack
   rack-piwik (~> 0.3.0)
   rack-timeout
@@ -524,6 +527,7 @@ DEPENDENCIES
   simple_form
   stackprof
   uglifier (>= 1.0.3)
+  unicorn (~> 5.1)
   webrick (~> 1.7)
 
 RUBY VERSION

Procfile

@@ -1 +1 @@
-web: bundle exec puma -C config/puma.rb
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

app/controllers/profiles_controller.rb

@@ -229,6 +229,7 @@ def profiles_for_index
 
   def build_categories_and_tags_for_tags_filter
     @categories = Category.sorted_categories
+    # builds variables like @tags_internet
     Category.all.includes(:translations).each do |category|
       tags = ActsAsTaggableOn::Tag
         .belongs_to_category(category.id)

config/honeybadger.yml

@@ -22,8 +22,8 @@ development_environments:
 # revision: null
 
 # Enable verbose debug logging (useful for troubleshooting).
-debug: true
+debug: false
 
 # Enable Honeybadger Insights
 insights:
-  enabled: true
+  enabled: false

config/unicorn.rb

@@ -0,0 +1,22 @@
+worker_processes Integer(ENV["WEB_CONCURRENCY"] || 1)
+timeout 15
+preload_app true
+
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
+  end
+
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+end