Merge pull request #3 from Intellection/fix-default-puma-threads

Fix the default number of puma threads

Author: zacblazic

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0
+
+* Upgrade to Ruby 2.5.0.
+* Default `:puma_threads` to 16 if not specified by the `GEMSTASH_PUMA_THREADS` environment variable.
+
 ## 1.1.0
 
 * Package gemstash v1.1.0.

CODEOWNERS

@@ -1,2 +1 @@
-* @itskingori
-* @zacblazic
+* @itskingori @tsu-shiuan @zacblazic

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.1-alpine
+FROM ruby:2.5.0-alpine
 
 # Install system dependencies
 RUN apk --update add \

app/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.4.1'
+ruby '2.5.0'
 
 # A simple, fast Mysql library for Ruby, binding to libmysql.
 gem 'mysql2', '~> 0.4.8'

app/Gemfile.lock

@@ -58,7 +58,7 @@ DEPENDENCIES
   pg (~> 0.21.0)
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.5.0p0
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

app/config.yml.erb

@@ -1,7 +1,7 @@
 :base_path: <%= "#{ENV['GEMSTASH_HOME']}/data" %>
 :cache_type: memory
 :rubygems_url: https://rubygems.org
-:puma_threads: <%= ENV['GEMSTASH_PUMA_THREADS'].to_i %>
+:puma_threads: <%= (ENV['GEMSTASH_PUMA_THREADS'] || 16).to_i %>
 :bind: tcp://0.0.0.0:9292
 :protected_fetch: false
 :fetch_timeout: 20
@@ -15,7 +15,6 @@
   :adapter: 'mysql2'
   :user: <%= ENV['GEMSTASH_DB_USERNAME'] %>
   :password: <%= ENV['GEMSTASH_DB_PASSWORD'] %>
-  :max_connections: <%= ENV['GEMSTASH_PUMA_THREADS'].to_i + 1 %>
 <% elsif ENV['GEMSTASH_DB_ADAPTER'] == 'postgres' %>
 # postgres adapter
 :db_adapter: postgres
@@ -24,7 +23,6 @@
   :adapter: 'postgres'
   :user: <%= ENV['GEMSTASH_DB_USERNAME'] %>
   :password: <%= ENV['GEMSTASH_DB_PASSWORD'] %>
-  :max_connections: <%= ENV['GEMSTASH_PUMA_THREADS'].to_i + 1 %>
   :connect_timeout: 10
   :read_timeout: 5
   :timeout: 30

docker-compose.sqlite.yml

@@ -8,7 +8,6 @@ services:
     image: zappi/gemstash:1.1.0
     environment:
       RACK_ENV: production
-      GEMSTASH_PUMA_THREADS: 1
     ports:
       - 9292:9292
     volumes: