Merge pull request #1972 from DMPRoadmap/feature/rollbar

Fix rollbar loading when optionally included
DMPRoadmap · Oct 30, 2018 · 8c4c9cd · 8c4c9cd
2 parents 7f226ed + c643f03
commit 8c4c9cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/config/application.rb b/config/application.rb
@@ -1,7 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-#require 'devise'
 require 'recaptcha/rails'
 require 'csv'
 
@@ -17,6 +16,13 @@
 #Changed when migrated to rails 4.0.0
 Bundler.require(*Rails.groups)
 
+begin
+  # If Rollbar has been included in the Bundle, load it here.
+  require "rollbar"
+rescue LoadError => e
+  # noop
+end
+
 module DMPRoadmap
   class Application < Rails::Application
 

diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-begin
-  # If Rollbar has been included in the Bundle, load it here.
-  require "rollbar"
-rescue LoadError => e
-  # noop
-end
-
 if defined?(Rollbar)
   Rollbar.configure do |config|
     # Without configuration, Rollbar is enabled in all environments.