diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7202898a..1c2f857b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base # Show an information page when migration fails and there is a version error. def migration_error? - render :migration_error unless ENV["DB_MIGRATE_FAILED"].blank? + render :migration_error, status: 500 unless ENV["DB_MIGRATE_FAILED"].blank? end def maintenance_mode? diff --git a/config/application.rb b/config/application.rb index 467bf900..5d91cf18 100644 --- a/config/application.rb +++ b/config/application.rb @@ -118,6 +118,9 @@ module Greenlight config.google_analytics = ENV["GOOGLE_ANALYTICS_TRACKING_ID"].present? + # Will always be true unless explicitly set to false + config.enable_cache = ENV["ENABLE_CACHED_PROVIDER"] != "false" + # MAINTENANCE config.maintenance_window = ENV["MAINTENANCE_WINDOW"] config.maintenance_mode = ENV["MAINTENANCE_MODE"] == "true" diff --git a/lib/bbb_api.rb b/lib/bbb_api.rb index 1b2f0c49..dedfdd88 100644 --- a/lib/bbb_api.rb +++ b/lib/bbb_api.rb @@ -28,7 +28,8 @@ module BbbApi raise "Provider not included." if !provider || provider.empty? cached_provider = Rails.cache.fetch("#{provider}/#{route}") - return cached_provider unless cached_provider.nil? + # Return cached result if the value exists and cache is enabled + return cached_provider if !cached_provider.nil? && Rails.configuration.enable_cache # Build the URI. uri = encode_bbb_url(