From b8117775e3c17d08096962deb5f4cc2c977d03c9 Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Wed, 16 Jan 2019 18:14:43 -0500 Subject: [PATCH] Remove puma worker killer (#1575) --- Gemfile | 1 - Gemfile.lock | 4 ---- config/puma.rb | 5 ----- 3 files changed, 10 deletions(-) diff --git a/Gemfile b/Gemfile index 1af650dc6..0ec5841f2 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,6 @@ gem "pg", "~> 1.1" gem "pry", "~> 0.12" gem "pry-rails", "~> 0.3" gem "puma", "~> 3.12" -gem "puma_worker_killer", "~> 0.1" gem "pundit", "~> 2.0" gem "pusher", "~> 1.3" gem "pusher-push-notifications", "~> 1.0" diff --git a/Gemfile.lock b/Gemfile.lock index e295b1cfd..9727669f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,9 +634,6 @@ GEM pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.0) - puma_worker_killer (0.1.0) - get_process_mem (~> 0.2) - puma (>= 2.7, < 4) pundit (2.0.0) activesupport (>= 3.0.0) pundit-matchers (1.6.0) @@ -994,7 +991,6 @@ DEPENDENCIES pry-byebug (~> 3.6) pry-rails (~> 0.3) puma (~> 3.12) - puma_worker_killer (~> 0.1) pundit (~> 2.0) pundit-matchers (~> 1.6) pusher (~> 1.3) diff --git a/config/puma.rb b/config/puma.rb index d86dbf4aa..3d5df9063 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -16,8 +16,3 @@ on_worker_boot do # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot ActiveRecord::Base.establish_connection end - -before_fork do - require "puma_worker_killer" - PumaWorkerKiller.enable_rolling_restart(12 * 3600) # 12 hours in seconds -end