govuk_app_config 9.20.6 → 9.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +1 -1
- data/CHANGELOG.md +8 -0
- data/lib/govuk_app_config/govuk_puma.rb +9 -0
- data/lib/govuk_app_config/railtie.rb +15 -0
- data/lib/govuk_app_config/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9c22a97238f5209bfd19e03115c7bd12d6fa85111e24f1a850f599cbd6e13a25
|
|
4
|
+
data.tar.gz: b428022bcb672a10e8c64974c8710482bb7dee0cdb6905c930cb7a2d43418330
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d578a4ead56f43a869121b5a40ea52502741f8d8ae27d32e8507b93f5340971b59555d42b36ed3f6870e06e1ecd835420270618b8a7bc206abae43100e371554
|
|
7
|
+
data.tar.gz: c3148eaad2bddb8a311f785213db5fa81b1562b4317332383bcc3e4b6ec6b5074079ce25856652bc1c7c7a857bcfc5abcd089c0d17820cb1a7c92119a03f9043
|
data/.github/workflows/ci.yml
CHANGED
|
@@ -38,7 +38,7 @@ jobs:
|
|
|
38
38
|
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
|
39
39
|
with:
|
|
40
40
|
ref: ${{ inputs.ref || github.ref }}
|
|
41
|
-
- uses: ruby/setup-ruby@
|
|
41
|
+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
|
|
42
42
|
with:
|
|
43
43
|
ruby-version: ${{ matrix.ruby }}
|
|
44
44
|
bundler-cache: true
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
require "prometheus_exporter/instrumentation"
|
|
2
|
+
|
|
1
3
|
module GovukPuma
|
|
2
4
|
def self.configure_rails(config)
|
|
3
5
|
config.port ENV.fetch("PORT", 3000)
|
|
@@ -35,6 +37,13 @@ module GovukPuma
|
|
|
35
37
|
ENV["BUNDLE_GEMFILE"] = "#{ENV['GOVUK_APP_ROOT']}/Gemfile"
|
|
36
38
|
end
|
|
37
39
|
|
|
40
|
+
config.after_worker_boot do
|
|
41
|
+
unless PrometheusExporter::Instrumentation::Puma.started?
|
|
42
|
+
PrometheusExporter::Instrumentation::Puma.start
|
|
43
|
+
end
|
|
44
|
+
PrometheusExporter::Instrumentation::Process.start(type: "puma_worker")
|
|
45
|
+
end
|
|
46
|
+
|
|
38
47
|
# Allow puma to be restarted by `rails restart` command.
|
|
39
48
|
config.plugin :tmp_restart
|
|
40
49
|
end
|
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
require "plek"
|
|
2
2
|
|
|
3
|
+
# Workaround for Logstasher initializer conflict under Rails 8.1
|
|
4
|
+
begin
|
|
5
|
+
require "logstasher/railtie"
|
|
6
|
+
|
|
7
|
+
if defined?(LogStasher::Railtie)
|
|
8
|
+
# Remove duplicate initializers that cause cyclic dependency
|
|
9
|
+
LogStasher::Railtie.initializers.delete_if { |i| i.name == :logstasher }
|
|
10
|
+
|
|
11
|
+
# Replace with a single clean initializer
|
|
12
|
+
LogStasher::Railtie.initializer(:logstasher_fixed, after: :load_config_initializers) {}
|
|
13
|
+
end
|
|
14
|
+
rescue LoadError, NameError
|
|
15
|
+
# Skip if Logstasher not present
|
|
16
|
+
end
|
|
17
|
+
|
|
3
18
|
module GovukAppConfig
|
|
4
19
|
class Railtie < Rails::Railtie
|
|
5
20
|
initializer "govuk_app_config.configure_govuk_proxy" do |app|
|