From 0c8696009f8485c1b10c37611c434247f7a28d1e Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 19 Aug 2023 15:41:32 -0500 Subject: [PATCH] upgrade to latest puma --- Gemfile | 2 +- Gemfile.lock | 4 ++-- puma_config.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7e39792a..8c43be89 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'redis-namespace' gem 'bcrypt' gem 'sinatra-flash', require: 'sinatra/flash' gem 'sinatra-xsendfile', require: 'sinatra/xsendfile' -gem 'puma', '5.6.7', require: nil +gem 'puma', '< 7', require: nil gem 'sidekiq', '~> 7.0.8' gem 'mail' gem 'net-smtp' diff --git a/Gemfile.lock b/Gemfile.lock index 0a8a1d19..a23517f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,7 +197,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.0) - puma (5.6.7) + puma (6.3.1) nio4r (~> 2.0) racc (1.7.1) rack (2.2.6.4) @@ -357,7 +357,7 @@ DEPENDENCIES paypal-recurring pg pry - puma (= 5.6.7) + puma (< 7) rack-cache rack-test rack_session_access diff --git a/puma_config.rb b/puma_config.rb index 62777654..447cb13d 100644 --- a/puma_config.rb +++ b/puma_config.rb @@ -1,7 +1,6 @@ require 'facter' -threads 1, 1 -#threads 5, 5 +#threads 1, 1 environment 'production' #daemonize pidfile '/var/run/neocities/neocities.pid' @@ -11,3 +10,4 @@ workers Facter.value('processors')['count'] preload_app! on_worker_boot { DB.disconnect } bind 'unix:/var/run/neocities/neocities.sock?backlog=2048' +supported_http_methods Puma::Const::IANA_HTTP_METHODS