diff --git a/app/lib/worker/jobs/process_queued_messages_job.rb b/app/lib/worker/jobs/process_queued_messages_job.rb index 9c0995229..f78a90040 100644 --- a/app/lib/worker/jobs/process_queued_messages_job.rb +++ b/app/lib/worker/jobs/process_queued_messages_job.rb @@ -46,12 +46,12 @@ def local_ip?(ip) # @return [void] def lock_message_for_processing QueuedMessage.joins(:server) - .where(ip_address_id: [nil, @ip_addresses]) - .where(locked_by: nil, locked_at: nil) - .ready_with_delayed_retry - .order("servers.priority DESC, queued_messages.id ASC") - .limit(1) - .update_all(locked_by: @locker, locked_at: @lock_time) + .where(ip_address_id: [nil, @ip_addresses]) + .where(locked_by: nil, locked_at: nil) + .ready_with_delayed_retry + .order("servers.priority DESC, queued_messages.id ASC") + .limit(1) + .update_all(locked_by: @locker, locked_at: @lock_time) end # Get a full list of all messages which we can process (i.e. those which have just