Fixes Chouette::Route.skip_callback/set_callback in RouteWayCostWorker. Refs #64076407-route--calculate-way-costs-on-after_commit-instead-of-a

1 files changed, 6 insertions, 5 deletions

diff --git a/app/workers/route_way_cost_worker.rb b/app/workers/route_way_cost_worker.rb
index d6bfed592..b62416c3d 100644
--- a/app/workers/route_way_cost_worker.rb
+++ b/app/workers/route_way_cost_worker.rb
@@ -7,10 +7,11 @@ class RouteWayCostWorker
 
     # Prevent recursive worker spawning since this call updates the
     # `costs` field of the route.
-    Chouette::Route.skip_callback(:save, :after, :calculate_costs!)
-
-    RouteWayCostCalculator.new(route).calculate!
-
-    Chouette::Route.set_callback(:save, :after, :calculate_costs!)
+    begin
+      Chouette::Route.skip_callback(:commit, :after, :calculate_costs!)
+      RouteWayCostCalculator.new(route).calculate!
+    ensure
+      Chouette::Route.set_callback(:commit, :after, :calculate_costs!)
+    end
   end
 end