aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhenium <rhenium@rhe.jp>2015-04-05 17:20:22 +0900
committerrhenium <rhenium@rhe.jp>2015-04-05 17:20:22 +0900
commitfa262166ef5da6c1d4fe41d7365ebc331fe4e469 (patch)
treefd893fab5c6906f2dc0f5708c17be66d3080f41c
parent181d786f2484e8078037495a17633427babef6da (diff)
downloadaclog-test_puma.tar.gz
web: remove puma_worker_killertest_puma
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
-rw-r--r--config/initializers/puma_worker_killer.rb7
3 files changed, 0 insertions, 13 deletions
diff --git a/Gemfile b/Gemfile
index f445fe5..6b977c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,6 @@ gem "bootstrap-sass"
gem "turbolinks"
gem "puma"
-gem "puma_worker_killer"
gem "dalli"
gem "omniauth-twitter"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e91357..16052d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,6 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.8)
formatador (0.2.5)
- get_process_mem (0.2.0)
globalid (0.3.3)
activesupport (>= 4.1.0)
grape (0.9.0)
@@ -208,9 +207,6 @@ GEM
pry (>= 0.9.10)
puma (2.11.1)
rack (>= 1.1, < 2.0)
- puma_worker_killer (0.0.3)
- get_process_mem (~> 0.1)
- puma (~> 2.7)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rabl (0.11.6)
@@ -378,7 +374,6 @@ DEPENDENCIES
omniauth-twitter
pry-rails
puma
- puma_worker_killer
quiet_assets
rails (~> 4.2.0)
rspec
diff --git a/config/initializers/puma_worker_killer.rb b/config/initializers/puma_worker_killer.rb
deleted file mode 100644
index 71d8483..0000000
--- a/config/initializers/puma_worker_killer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-PumaWorkerKiller.config do |config|
- config.ram = 1024
- config.frequency = 5 # sec
- config.percent_usage = 0.98
-end
-
-PumaWorkerKiller.start