Skip to content

Commit

Permalink
fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
colby-swandale authored and segiddins committed May 8, 2024
1 parent aa4f3cc commit c1df514
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
18 changes: 9 additions & 9 deletions config/deploy/web.yaml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ spec:
annotations:
ad.datadoghq.com/puma.logs: '[{"source":"rails","service":"rubygems.org","version": <%= current_sha.dump %>},"environment": <%= environment.dump %>]'
ad.datadoghq.com/puma.checks: |
{
"puma": {
"init_config": {
service: "rubygems.org",
},
"instances": [
"control_url": "http://%%host%%:9293/stats?token=%%ENC[k8s_secret@rubygems-<%= environment %>/<%= environment %>/puma_control_auth_token]%%"
]
{
"puma": {
"init_config": {
service: "rubygems.org",
},
"instances": [
"control_url": "http://%%host%%:9293/stats?token=%%ENC[k8s_secret@rubygems-<%= environment %>/<%= environment %>/puma_control_auth_token]%%"
]
}
}
}
labels:
name: web
tags.datadoghq.com/env: "<%= environment %>"
Expand Down
4 changes: 1 addition & 3 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }

# Optionally enable the Puma Control/Metrics API
if ENV["PUMA_CONTROL_ENABLED"]&.present?
activate_control_app "tcp://127.0.0.1:9293", { auth_token: ENV.fetch("PUMA_CONTROL_AUTH_TOKEN") }
end
activate_control_app "tcp://127.0.0.1:9293", { auth_token: ENV.fetch("PUMA_CONTROL_AUTH_TOKEN") } if ENV["PUMA_CONTROL_ENABLED"].present?

before_fork do
sleep 1
Expand Down

0 comments on commit c1df514

Please sign in to comment.