forked from External/greenlight
Complete refactor of Gemfile and upgraded gems (#2553)
This commit is contained in:
@ -149,9 +149,10 @@ module Greenlight
|
||||
config.primary_color_darken_default = "#316cbe"
|
||||
|
||||
# Default registration method if the user does not specify one
|
||||
config.registration_method_default = if ENV["DEFAULT_REGISTRATION"] == "invite"
|
||||
config.registration_method_default = case ENV["DEFAULT_REGISTRATION"]
|
||||
when "invite"
|
||||
config.registration_methods[:invite]
|
||||
elsif ENV["DEFAULT_REGISTRATION"] == "approval"
|
||||
when "approval"
|
||||
config.registration_methods[:approval]
|
||||
else
|
||||
config.registration_methods[:open]
|
||||
|
@ -148,7 +148,7 @@ Rails.application.configure do
|
||||
config.log_tags = [:request_id]
|
||||
|
||||
if ENV["RAILS_LOG_TO_STDOUT"] == "true"
|
||||
logger = ActiveSupport::Logger.new(STDOUT)
|
||||
logger = ActiveSupport::Logger.new($stdout)
|
||||
logger.formatter = config.log_formatter
|
||||
config.logger = ActiveSupport::TaggedLogging.new(logger)
|
||||
elsif ENV["RAILS_LOG_REMOTE_NAME"] && ENV["RAILS_LOG_REMOTE_PORT"]
|
||||
|
@ -6,16 +6,16 @@
|
||||
# the maximum value specified for Puma. Default is set to 5 threads for minimum
|
||||
# and maximum; this matches the default thread size of Active Record.
|
||||
#
|
||||
threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
|
||||
threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
|
||||
threads threads_count, threads_count
|
||||
|
||||
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
|
||||
#
|
||||
port ENV.fetch("PORT") { 80 }
|
||||
port ENV.fetch("PORT", 80)
|
||||
|
||||
# Specifies the `environment` that Puma will run in.
|
||||
#
|
||||
environment ENV.fetch("RAILS_ENV") { "development" }
|
||||
environment ENV.fetch("RAILS_ENV", "development")
|
||||
|
||||
# Specifies the number of `workers` to boot in clustered mode.
|
||||
# Workers are forked webserver processes. If using threads and workers together
|
||||
@ -23,7 +23,7 @@ environment ENV.fetch("RAILS_ENV") { "development" }
|
||||
# Workers do not work on JRuby or Windows (both of which do not support
|
||||
# processes).
|
||||
#
|
||||
workers ENV.fetch("WEB_CONCURRENCY") { 1 }
|
||||
workers ENV.fetch("WEB_CONCURRENCY", 1)
|
||||
|
||||
# Use the `preload_app!` method when specifying a `workers` number.
|
||||
# This directive tells Puma to first boot the application and load code
|
||||
|
Reference in New Issue
Block a user