Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees

Gemfile.lock

@@ -353,7 +353,7 @@ GEM
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
-    newrelic_rpm (3.6.7.152)
+    newrelic_rpm (3.12.0.288)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oj (2.1.2)

app/controllers/spree/api/line_items_controller_decorator.rb

@@ -1,5 +1,8 @@
 Spree::Api::LineItemsController.class_eval do
-  after_filter :apply_enterprise_fees, :only => :update
+  after_filter :apply_enterprise_fees, only: :update
+
+
+  private
 
   def apply_enterprise_fees
     authorize! :read, order

app/models/spree/order_decorator.rb

@@ -157,20 +157,22 @@ Spree::Order.class_eval do
   end
 
   def update_distribution_charge!
-    EnterpriseFee.clear_all_adjustments_on_order self
+    with_lock do
+      EnterpriseFee.clear_all_adjustments_on_order self
 
-    line_items.each do |line_item|
-      if provided_by_order_cycle? line_item
-        OpenFoodNetwork::EnterpriseFeeCalculator.new.create_line_item_adjustments_for line_item
+      line_items.each do |line_item|
+        if provided_by_order_cycle? line_item
+          OpenFoodNetwork::EnterpriseFeeCalculator.new.create_line_item_adjustments_for line_item
 
-      else
-        pd = product_distribution_for line_item
-        pd.create_adjustment_for line_item if pd
+        else
+          pd = product_distribution_for line_item
+          pd.create_adjustment_for line_item if pd
+        end
       end
-    end
 
-    if order_cycle
-      OpenFoodNetwork::EnterpriseFeeCalculator.new.create_order_adjustments_for self
+      if order_cycle
+        OpenFoodNetwork::EnterpriseFeeCalculator.new.create_order_adjustments_for self
+      end
     end
   end
 

config/unicorn.rb

@@ -1,27 +1,2 @@
-preload_app true   # https://newrelic.com/docs/ruby/no-data-with-unicorn
-worker_processes 4 # amount of unicorn workers to spin up
-timeout 60         # restarts workers that hang for 30 seconds
-
-
-# https://devcenter.heroku.com/articles/forked-pg-connections
-before_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
-  end
-
-  defined?(ActiveRecord::Base) and
-    ActiveRecord::Base.establish_connection
-
-end
+worker_processes 2 # amount of unicorn workers to spin up
+timeout 120         # restarts workers that hang for 30 seconds