oobgc

shirokanezoo · Sep 26, 2015 · d9ee9c7 · d9ee9c7
1 parent 8f774e7
commit d9ee9c7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/5q/config/nginx.conf b/5q/config/nginx.conf
@@ -9,7 +9,6 @@ events {
 http {
   upstream unicorn {
     server unix:/tmp/unicorn.sock fail_timeout=0;
-    keepalive 4;
   }
 
   log_format ltsv "status:$status"
@@ -51,15 +50,11 @@ http {
 
     location = / {
       add_header Cache-Control private;
-      proxy_http_version 1.1;
-      proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_pass http://unicorn;
     }
 
     location / {
-      proxy_http_version 1.1;
-      proxy_set_header Connection "";
       proxy_set_header Host $host;
       proxy_pass http://unicorn;
     }

diff --git a/5q/webapp/ruby/Gemfile b/5q/webapp/ruby/Gemfile
@@ -8,3 +8,4 @@ gem "erubis"
 gem "unicorn"
 gem 'redis'
 gem 'stackprof'
+gem 'gctools'
diff --git a/5q/webapp/ruby/Gemfile.lock b/5q/webapp/ruby/Gemfile.lock
@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     erubis (2.7.0)
+    gctools (0.2.3)
     kgio (2.10.0)
     mysql2 (0.4.0)
     mysql2-cs-bind (0.0.6)
@@ -27,6 +28,7 @@ PLATFORMS
 
 DEPENDENCIES
   erubis
+  gctools
   mysql2
   mysql2-cs-bind
   redis

diff --git a/5q/webapp/ruby/config.ru b/5q/webapp/ruby/config.ru
@@ -12,4 +12,7 @@ unless ENV['ISUCON5_DISABLE_LOGS'] == '1'
                              path: '/tmp/stackprof'
 end
 
+require 'gctools/oobgc'
+use(GC::OOB::UnicornMiddleware) # in config.ru for unicorn
+
 run Isucon5::WebApp