aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-01-12 22:28:54 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-01-12 22:28:54 +0900
commit6b1d513ae43a67ee5f71ac217b4e399b0586a5cf (patch)
tree1a262b9a8b7446e1e11135857077f33d7aed05b2
parent963d2fdc70ec8e9f85e1c245d1fc2935acb4ac6f (diff)
downloadpoe-6b1d513ae43a67ee5f71ac217b4e399b0586a5cf.tar.gz
use puma than thin
-rw-r--r--Gemfile2
-rw-r--r--config/puma.rb17
-rw-r--r--config/thin.rb7
3 files changed, 18 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 76a35ef..30bab8c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "bootstrap-sass"
gem "codemirror-rails"
# gem "plum"
-gem "thin"
+gem "puma"
group :development, :test do
# gem "byebug"
diff --git a/config/puma.rb b/config/puma.rb
new file mode 100644
index 0000000..93d5f3c
--- /dev/null
+++ b/config/puma.rb
@@ -0,0 +1,17 @@
+threads 8, 16
+workers 2
+environment "production"
+
+bind "unix://" + File.join(File.expand_path("../../", __FILE__), "tmp/sockets/rack.sock")
+
+on_worker_boot do
+ ActiveSupport.on_load(:active_record) do
+ ActiveRecord::Base.establish_connection
+ end
+end
+
+before_fork do
+ ActiveRecord::Base.connection_pool.disconnect!
+end
+
+preload_app!
diff --git a/config/thin.rb b/config/thin.rb
deleted file mode 100644
index 95381db..0000000
--- a/config/thin.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-timeout: 60
-wait: 30
-log: log/thin.log
-threaded: true
-socket: tmp/sockets/rack.sock
-pid: tmp/pids/thin.sock
-environment: production