Merge pull request #65 from alphagov/msw/bad

Fix bad method invocation for enable_railtie_for?
alphagov · Jan 3, 2019 · 5b26bf0 · 5b26bf0
2 parents cd085c3 + 0e1e0fe
commit 5b26bf0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fix crash on start due to incorrect method invocation.
+
 # 1.11.0
 
 * Disable X-Ray entirely if the `GOVUK_APP_CONFIG_DISABLE_XRAY`

diff --git a/lib/govuk_app_config/railtie.rb b/lib/govuk_app_config/railtie.rb
@@ -1,19 +1,19 @@
 module GovukAppConfig
   class Railtie < Rails::Railtie
+    def self.enable_railtie_for?(name)
+      Rails.env.production? && !ENV.has_key?("GOVUK_APP_CONFIG_DISABLE_#{name.upcase}")
+    end
+
     initializer('govuk_app_config') do |app|
-      GovukXRay.initialize(app) if enable_railtie_for?('xray')
+      GovukXRay.initialize(app) if self.enable_railtie_for?('xray')
     end
 
     config.before_initialize do
       GovukLogging.configure if Rails.env.production?
     end
 
     config.after_initialize do
-      GovukXRay.start if enable_railtie_for?('xray')
-    end
-
-    def self.enable_railtie_for?(name)
-      Rails.env.production? && !ENV.has_key?("GOVUK_APP_CONFIG_DISABLE_#{name.upcase}")
+      GovukXRay.start if self.enable_railtie_for?('xray')
     end
   end
 end