Merge 61df47b into 030cdd0

config/puma.rb

@@ -23,14 +23,14 @@
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-workers ENV.fetch("WEB_CONCURRENCY") { 4 }
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
 # process behavior so workers use less memory.
 #
-preload_app!
+# preload_app!
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

sample.env

@@ -252,15 +252,3 @@ DB_PASSWORD=password
 #   invite - For invite only registration
 #   approval - For approve/decline registration
 DEFAULT_REGISTRATION=open
-
-# Web server settings
-#
-# The size of the thread pool per worker used by Greenlight's web server.
-# For details, see: https://github.com/puma/puma#thread-pool
-# Default: 5
-#RAILS_MAX_THREADS=5
-#
-# The amount of workers (separate processes) used by the web server.
-# For details, see: https://github.com/puma/puma#clustered-mode
-# Default: 4
-#WEB_CONCURRENCY=4