techhub/mastodon
2
0
Fork 0
Code Activity

Update to puma 7 (#36238)

Browse Source
This commit is contained in:
David Roetzel
2025-09-23 15:40:04 +02:00
committed by GitHub
parent 82f5901a3f
commit 37cec638df
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
ruby '>= 3.2.0', '< 3.5.0' ruby '>= 3.2.0', '< 3.5.0'
gem 'propshaft' gem 'propshaft'
gem 'puma', '~> 6.3' gem 'puma', '~> 7.0'
gem 'rails', '~> 8.0' gem 'rails', '~> 8.0'
gem 'thor', '~> 1.2' gem 'thor', '~> 1.2'

4
Gemfile.lock
View File

@@ -637,7 +637,7 @@ GEM
date date
stringio stringio
public_suffix (6.0.2) public_suffix (6.0.2)
puma (6.6.1) puma (7.0.3)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.5.1) pundit (2.5.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -1052,7 +1052,7 @@ DEPENDENCIES
prometheus_exporter (~> 2.2) prometheus_exporter (~> 2.2)
propshaft propshaft
public_suffix (~> 6.0) public_suffix (~> 6.0)
puma (~> 6.3) puma (~> 7.0)
pundit (~> 2.3) pundit (~> 2.3)
rack-attack (~> 6.6) rack-attack (~> 6.6)
rack-cors rack-cors

4
config/puma.rb
View File

@@ -27,7 +27,7 @@ if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
end end
end end
on_worker_boot do before_worker_boot do
# Ruby process metrics (memory, GC, etc) # Ruby process metrics (memory, GC, etc)
PrometheusExporter::Instrumentation::Process.start(type: 'puma') PrometheusExporter::Instrumentation::Process.start(type: 'puma')
@@ -44,7 +44,7 @@ if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
end end
end end
on_worker_boot do before_worker_boot do
ActiveSupport.on_load(:active_record) do ActiveSupport.on_load(:active_record) do
ActiveRecord::Base.establish_connection ActiveRecord::Base.establish_connection
end end