Wrap web execution in jemalloc, update to 2.2.3, update deps

idris-hackers · Nov 17, 2015 · 98ca33e · 98ca33e
1 parent 7a7c470
commit 98ca33e
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 72 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.3
+2.2.3
diff --git a/Gemfile b/Gemfile
@@ -2,27 +2,27 @@ source 'https://rubygems.org'
 
 ruby File.read(File.expand_path('../.ruby-version', __FILE__)).strip if ENV.key?('DYNO')
 
-gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'activesupport', '~> 4.0'
 gem 'addressable', '~> 2.3'
-
-gem 'sinatra', '~> 1.4'
+gem 'coder'
+gem 'jemalloc'
+gem 'metriks', '0.9.9.6'
+gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
 gem 'puma'
-gem 'sentry-raven'
 gem 'rack-ssl', '~> 1.4'
-gem 'metriks',         '0.9.9.6'
-gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
-gem 'coder'
+gem 'sentry-raven'
+gem 'sinatra', '~> 1.4'
+gem 'travis-support', github: 'travis-ci/travis-support'
 
 group :development do
   gem 'rerun'
 end
 
 group :test do
-  gem 'mocha',       '~> 0.10.0'
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'mocha', '~> 0.10.0'
   gem 'pry'
-  gem 'rspec',       '~> 3.0'
-  gem 'simplecov',   require: false
+  gem 'rspec', '~> 3.0'
+  gem 'simplecov', require: false
   gem 'sinatra-contrib'
-  gem "codeclimate-test-reporter", group: :test, require: nil
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,46 +1,43 @@
 GIT
   remote: git://github.com/eric/metriks-librato_metrics.git
-  revision: ccbeb751ec5fc4edfe446d8a67a423b96ebe86c7
+  revision: 2c124f024fd2e34378260cd24b0e8687ff9bd196
   specs:
-    metriks-librato_metrics (1.0.2)
+    metriks-librato_metrics (1.0.5)
       metriks (>= 0.9.9.6)
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 4fdd220ed7b06a12951e5d74a763c05a80eb0d20
+  revision: 2cd02d2a06fdd1e2fc2f129148c168b56f7c190f
   specs:
     travis-support (0.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.2)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    atomic (1.1.16)
+    addressable (2.3.8)
+    atomic (1.1.99)
     avl_tree (1.1.3)
-    backports (3.6.0)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    codeclimate-test-reporter (0.4.7)
+    backports (3.6.7)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coder (0.4.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    hashie (2.1.1)
-    hitimes (1.2.2)
-    i18n (0.6.9)
-    json (1.8.1)
-    listen (2.7.5)
-      celluloid (>= 0.15.2)
+    ffi (1.9.10)
+    hitimes (1.2.3)
+    i18n (0.7.0)
+    jemalloc (1.0.1)
+    json (1.8.3)
+    listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     metaclass (0.0.4)
@@ -49,68 +46,64 @@ GEM
       atomic (~> 1.0)
       avl_tree (~> 1.1.2)
       hitimes (~> 1.1)
-    minitest (5.3.5)
+    minitest (5.8.2)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
+    puma (2.15.3)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rack-ssl (1.4.1)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
+    rb-fsevent (0.9.6)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rerun (0.11.0)
+      listen (~> 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    sentry-raven (0.8.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.0)
+    sentry-raven (0.15.2)
       faraday (>= 0.7.6)
-      hashie (>= 1.1.0)
-      uuidtools
-    simplecov (0.9.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.2)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
       backports (>= 2.0)
       multi_json
       rack-protection
       rack-test
       sinatra (~> 1.4.0)
-      tilt (~> 1.3)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timers (1.1.0)
-    tzinfo (1.2.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uuidtools (2.1.4)
 
 PLATFORMS
   ruby
@@ -120,6 +113,7 @@ DEPENDENCIES
   addressable (~> 2.3)
   codeclimate-test-reporter
   coder
+  jemalloc
   metriks (= 0.9.9.6)
   metriks-librato_metrics!
   mocha (~> 0.10.0)
@@ -133,3 +127,6 @@ DEPENDENCIES
   sinatra (~> 1.4)
   sinatra-contrib
   travis-support!
+
+BUNDLED WITH
+   1.10.6
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: ./script/server
+web: bundle exec je puma -I lib -p $PORT -t ${PUMA_MIN_THREADS:-8}:${PUMA_MAX_THREADS:-12} -w ${PUMA_WORKERS:-2}
diff --git a/script/server b/script/server
@@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
 [ $PORT ]     || PORT=5000
 [ $RACK_ENV ] || RACK_ENV=development
 
-cmd="bundle exec puma -I lib -p $PORT -t ${PUMA_MIN_THREADS:-8}:${PUMA_MAX_THREADS:-12} -w ${PUMA_WORKERS:-2}"
+cmd="bundle exec je puma -I lib -p $PORT -t ${PUMA_MIN_THREADS:-8}:${PUMA_MAX_THREADS:-12} -w ${PUMA_WORKERS:-2}"
 [[ $RACK_ENV == "development" ]] && exec rerun -p '**/*.{rb,ru}' "$cmd"
 exec $cmd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: ./script/server
		web: bundle exec je puma -I lib -p $PORT -t ${PUMA_MIN_THREADS:-8}:${PUMA_MAX_THREADS:-12} -w ${PUMA_WORKERS:-2}