diff --git a/Gemfile b/Gemfile index 678c379..48d8bf7 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem "nio4r" gem "ostruct" gem "prometheus-client" gem "puma" +gem "rackup" gem "rails", "= 7.1.5.2" gem "resolv" gem "secure_headers" diff --git a/Gemfile.lock b/Gemfile.lock index c2f273d..673d2bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -466,6 +466,7 @@ DEPENDENCIES ostruct prometheus-client puma + rackup rails (= 7.1.5.2) resolv rspec diff --git a/app/util/health_server.rb b/app/util/health_server.rb index 9e8cef2..54e7996 100644 --- a/app/util/health_server.rb +++ b/app/util/health_server.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "socket" -require "rack/handler/webrick" +require "rackup/handler/webrick" require "prometheus/client/formats/text" class HealthServer @@ -55,11 +55,11 @@ class HealthServer port = ENV.fetch("HEALTH_SERVER_PORT", default_port) bind_address = ENV.fetch("HEALTH_SERVER_BIND_ADDRESS", default_bind_address) - Rack::Handler::WEBrick.run(new(**options), - Port: port, - BindAddress: bind_address, - AccessLog: [], - Logger: LoggerProxy.new) + Rackup::Handler::WEBrick.run(new(**options), + Port: port, + BindAddress: bind_address, + AccessLog: [], + Logger: LoggerProxy.new) rescue Errno::EADDRINUSE Postal.logger.info "health server port (#{bind_address}:#{port}) is already " \ "in use, not starting health server" @@ -95,7 +95,7 @@ class HealthServer Postal.logger.info "stopped health server", component: "health-server" when /\AWEBrick [\d.]+/, /\Aruby ([\d.]+)/, - /\ARack::Handler::WEBrick is mounted/, + /\ARackup::Handler::WEBrick is mounted/, /\Aclose TCPSocket/, /\Agoing to shutdown/ # Don't actually print routine messages to avoid too much