Skip to content

Replace Webrick with Puma #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Replace Webrick with Puma #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32d820b
Replace Webrick with Puma
sbezugliy Nov 30, 2023
964a410
Update minor version
sbezugliy Nov 30, 2023
838505e
Update Rack
sbezugliy Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions lib/sidekiq_prometheus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
require "prometheus/middleware/exporter"
require "sidekiq"
require "sidekiq/api"
require "webrick"
require "rack/handler/puma"

begin
require "sidekiq/ent"
Expand Down Expand Up @@ -65,9 +65,6 @@ class << self
# @return [Integer] Port on which the metrics server will listen. Default: 9357
attr_accessor :metrics_port

# @return [Boolean] When set to false will silence the metric server access logs. Default: true
attr_accessor :metrics_server_logger_enabled

# Override the default Prometheus::Client
# @return [Prometheus::Client]
attr_writer :client
Expand All @@ -87,7 +84,6 @@ class << self
self.metrics_server_enabled = true
self.metrics_host = "localhost"
self.metrics_port = 9359
self.metrics_server_logger_enabled = true
self.custom_labels = {}
self.custom_metrics = []
self.init_label_sets = {}
Expand Down Expand Up @@ -142,13 +138,6 @@ def metrics_server_enabled?
metrics_server_enabled
end

##
# Helper method for +metrics_server_logger_enabled+ configuration setting
# @return [Boolean] defaults to true
def metrics_server_logger_enabled?
metrics_server_logger_enabled
end

##
# Get a metric from the registry
# @param metric [Symbol] name of metric to fetch
Expand Down Expand Up @@ -224,13 +213,8 @@ def metrics_server
Host: SidekiqPrometheus.metrics_host
}

unless metrics_server_logger_enabled?
opts[:Logger] = WEBrick::Log.new("/dev/null")
opts[:AccessLog] = []
end

@_metrics_server ||= Thread.new do
Rack::Handler::WEBrick.run(
Rack::Handler::Puma.run(
Rack::Builder.new {
use Prometheus::Middleware::Exporter, registry: SidekiqPrometheus.registry
run ->(_) { [301, {"Location" => "/metrics"}, []] }
Expand Down
2 changes: 1 addition & 1 deletion lib/sidekiq_prometheus/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module SidekiqPrometheus
VERSION = "2.0.1"
VERSION = "2.0.2"
end
4 changes: 2 additions & 2 deletions sidekiq_prometheus.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "standard"

spec.add_runtime_dependency "prometheus-client", ">= 2.0"
spec.add_runtime_dependency "rack", "< 3.0"
spec.add_runtime_dependency "rack", " ~> 3.0"
spec.add_runtime_dependency "redis"
spec.add_runtime_dependency "sidekiq", "> 5.1"
spec.add_runtime_dependency "webrick"
spec.add_runtime_dependency "puma"
end