Merge pull request #776 from dsander/async-receive-order-fix

Fix random spec failure caused by async_receive not ordering queried events

Dominik Sander 10 年之前
父节点
当前提交
26fe6068b3
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      app/models/agent.rb

+ 1 - 1
app/models/agent.rb

@@ -396,7 +396,7 @@ class Agent < ActiveRecord::Base
396 396
       agent = Agent.find(agent_id)
397 397
       begin
398 398
         return if agent.unavailable?
399
-        agent.receive(Event.where(:id => event_ids))
399
+        agent.receive(Event.where(:id => event_ids).order(:id))
400 400
         agent.last_receive_at = Time.now
401 401
         agent.save!
402 402
       rescue => e