مراية لـ
https://github.com/postalserver/postal.git
تم المزامنة 2025-11-30 21:32:30 +00:00
fix(health_server): use rackup handler instead of rack handler
هذا الالتزام موجود في:
1
Gemfile
1
Gemfile
@@ -28,6 +28,7 @@ gem "nio4r"
|
|||||||
gem "ostruct"
|
gem "ostruct"
|
||||||
gem "prometheus-client"
|
gem "prometheus-client"
|
||||||
gem "puma"
|
gem "puma"
|
||||||
|
gem "rackup"
|
||||||
gem "rails", "= 7.1.5.2"
|
gem "rails", "= 7.1.5.2"
|
||||||
gem "resolv"
|
gem "resolv"
|
||||||
gem "secure_headers"
|
gem "secure_headers"
|
||||||
|
|||||||
@@ -466,6 +466,7 @@ DEPENDENCIES
|
|||||||
ostruct
|
ostruct
|
||||||
prometheus-client
|
prometheus-client
|
||||||
puma
|
puma
|
||||||
|
rackup
|
||||||
rails (= 7.1.5.2)
|
rails (= 7.1.5.2)
|
||||||
resolv
|
resolv
|
||||||
rspec
|
rspec
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "socket"
|
require "socket"
|
||||||
require "rack/handler/webrick"
|
require "rackup/handler/webrick"
|
||||||
require "prometheus/client/formats/text"
|
require "prometheus/client/formats/text"
|
||||||
|
|
||||||
class HealthServer
|
class HealthServer
|
||||||
@@ -55,11 +55,11 @@ class HealthServer
|
|||||||
port = ENV.fetch("HEALTH_SERVER_PORT", default_port)
|
port = ENV.fetch("HEALTH_SERVER_PORT", default_port)
|
||||||
bind_address = ENV.fetch("HEALTH_SERVER_BIND_ADDRESS", default_bind_address)
|
bind_address = ENV.fetch("HEALTH_SERVER_BIND_ADDRESS", default_bind_address)
|
||||||
|
|
||||||
Rack::Handler::WEBrick.run(new(**options),
|
Rackup::Handler::WEBrick.run(new(**options),
|
||||||
Port: port,
|
Port: port,
|
||||||
BindAddress: bind_address,
|
BindAddress: bind_address,
|
||||||
AccessLog: [],
|
AccessLog: [],
|
||||||
Logger: LoggerProxy.new)
|
Logger: LoggerProxy.new)
|
||||||
rescue Errno::EADDRINUSE
|
rescue Errno::EADDRINUSE
|
||||||
Postal.logger.info "health server port (#{bind_address}:#{port}) is already " \
|
Postal.logger.info "health server port (#{bind_address}:#{port}) is already " \
|
||||||
"in use, not starting health server"
|
"in use, not starting health server"
|
||||||
@@ -95,7 +95,7 @@ class HealthServer
|
|||||||
Postal.logger.info "stopped health server", component: "health-server"
|
Postal.logger.info "stopped health server", component: "health-server"
|
||||||
when /\AWEBrick [\d.]+/,
|
when /\AWEBrick [\d.]+/,
|
||||||
/\Aruby ([\d.]+)/,
|
/\Aruby ([\d.]+)/,
|
||||||
/\ARack::Handler::WEBrick is mounted/,
|
/\ARackup::Handler::WEBrick is mounted/,
|
||||||
/\Aclose TCPSocket/,
|
/\Aclose TCPSocket/,
|
||||||
/\Agoing to shutdown/
|
/\Agoing to shutdown/
|
||||||
# Don't actually print routine messages to avoid too much
|
# Don't actually print routine messages to avoid too much
|
||||||
|
|||||||
المرجع في مشكلة جديدة
حظر مستخدم