From e7758b8b68e33ca770fcedec0ae66e636276be08 Mon Sep 17 00:00:00 2001 From: Jonathan Boler Date: Mon, 4 Jun 2018 12:56:36 -0500 Subject: Eager load routes on rebuild --- railties/lib/rails/application/routes_reloader.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb index 2ef09b4162..916988a651 100644 --- a/railties/lib/rails/application/routes_reloader.rb +++ b/railties/lib/rails/application/routes_reloader.rb @@ -7,7 +7,7 @@ module Rails class RoutesReloader attr_reader :route_sets, :paths attr_accessor :eager_load - delegate :updated?, to: :updater + delegate :execute_if_updated, :execute, :updated?, to: :updater def initialize @paths = [] @@ -19,23 +19,11 @@ module Rails clear! load_paths finalize! + route_sets.each(&:eager_load!) if eager_load ensure revert end - def execute - ret = updater.execute - route_sets.each(&:eager_load!) if eager_load - ret - end - - def execute_if_updated - if updated = updater.execute_if_updated - route_sets.each(&:eager_load!) if eager_load - end - updated - end - private def updater -- cgit v1.2.3