From 0355276524ac14403e0932ecf7c6c1801b7cb7f4 Mon Sep 17 00:00:00 2001 From: Adam Mikulasev Date: Mon, 11 Nov 2024 21:43:54 +1100 Subject: [PATCH] rename dequeued status to buffered (#174) --- lib/outboxer/message.rb | 4 +-- lib/outboxer/messages.rb | 10 +++--- lib/outboxer/models/message.rb | 6 ++-- lib/outboxer/publisher.rb | 34 +++++++++---------- lib/outboxer/web/views/error.erb | 2 +- lib/outboxer/web/views/home.erb | 2 +- lib/outboxer/web/views/layout.erb | 2 +- spec/factories/outboxer_messages.rb | 4 +-- spec/lib/outboxer/message/can_requeue_spec.rb | 6 ++-- spec/lib/outboxer/message/publishing_spec.rb | 6 ++-- .../{dequeue_spec.rb => buffer_spec.rb} | 12 +++---- .../lib/outboxer/messages/can_requeue_spec.rb | 6 ++-- spec/lib/outboxer/messages/delete_all_spec.rb | 6 ++-- .../outboxer/messages/delete_by_ids_spec.rb | 2 +- .../lib/outboxer/messages/list/filter_spec.rb | 8 ++--- .../messages/list/no_arguments_spec.rb | 2 +- spec/lib/outboxer/messages/list/sort_spec.rb | 6 ++-- spec/lib/outboxer/messages/metrics_spec.rb | 16 ++++----- .../lib/outboxer/messages/requeue_all_spec.rb | 8 ++--- spec/lib/outboxer/publisher/publish_spec.rb | 10 +++--- 20 files changed, 76 insertions(+), 76 deletions(-) rename spec/lib/outboxer/messages/{dequeue_spec.rb => buffer_spec.rb} (71%) diff --git a/lib/outboxer/message.rb b/lib/outboxer/message.rb index 8a2a90ad..9dc87fca 100644 --- a/lib/outboxer/message.rb +++ b/lib/outboxer/message.rb @@ -59,7 +59,7 @@ def publishing(id:, publisher_id: nil, publisher_name: nil, ActiveRecord::Base.transaction do message = Models::Message.lock.find_by!(id: id) - if message.status != Models::Message::Status::DEQUEUED + if message.status != Models::Message::Status::BUFFERED raise ArgumentError, "cannot transition outboxer message #{message.id} " \ "from #{message.status} to #{Models::Message::Status::PUBLISHING}" @@ -159,7 +159,7 @@ def delete(id:) end end - REQUEUE_STATUSES = [:dequeued, :publishing, :failed] + REQUEUE_STATUSES = [:buffered, :publishing, :failed] def can_requeue?(status:) REQUEUE_STATUSES.include?(status&.to_sym) diff --git a/lib/outboxer/messages.rb b/lib/outboxer/messages.rb index 6072493f..6c67e4f0 100644 --- a/lib/outboxer/messages.rb +++ b/lib/outboxer/messages.rb @@ -2,8 +2,8 @@ module Outboxer module Messages extend self - def dequeue(limit: 1, publisher_id: nil, publisher_name: nil, - current_utc_time: Time.now.utc) + def buffer(limit: 1, publisher_id: nil, publisher_name: nil, + current_utc_time: Time.now.utc) ActiveRecord::Base.connection_pool.with_connection do ActiveRecord::Base.transaction do messages = Models::Message @@ -17,7 +17,7 @@ def dequeue(limit: 1, publisher_id: nil, publisher_name: nil, Models::Message .where(id: messages.map { |message| message[:id] }) .update_all( - status: Models::Message::Status::DEQUEUED, + status: Models::Message::Status::BUFFERED, updated_at: current_utc_time, updated_by_publisher_id: publisher_id, updated_by_publisher_name: publisher_name) @@ -35,7 +35,7 @@ def dequeue(limit: 1, publisher_id: nil, publisher_name: nil, end end - LIST_STATUS_OPTIONS = [nil, :queued, :dequeued, :publishing, :published, :failed] + LIST_STATUS_OPTIONS = [nil, :queued, :buffered, :publishing, :published, :failed] LIST_STATUS_DEFAULT = nil LIST_SORT_OPTIONS = [:id, :status, :messageable, :created_at, :updated_at, :updated_by_publisher_name] @@ -115,7 +115,7 @@ def list(status: LIST_STATUS_DEFAULT, } end - REQUEUE_STATUSES = [:dequeued, :publishing, :failed] + REQUEUE_STATUSES = [:buffered, :publishing, :failed] def can_requeue?(status:) REQUEUE_STATUSES.include?(status&.to_sym) diff --git a/lib/outboxer/models/message.rb b/lib/outboxer/models/message.rb index 9f549532..daeaca76 100644 --- a/lib/outboxer/models/message.rb +++ b/lib/outboxer/models/message.rb @@ -19,7 +19,7 @@ class Message < ::ActiveRecord::Base module Status QUEUED = 'queued' - DEQUEUED = 'dequeued' + BUFFERED = 'buffered' PUBLISHING = 'publishing' PUBLISHED = 'published' FAILED = 'failed' @@ -27,14 +27,14 @@ module Status STATUSES = [ Status::QUEUED, - Status::DEQUEUED, + Status::BUFFERED, Status::PUBLISHING, Status::PUBLISHED, Status::FAILED ] scope :queued, -> { where(status: Status::QUEUED) } - scope :dequeued, -> { where(status: Status::DEQUEUED) } + scope :buffered, -> { where(status: Status::BUFFERED) } scope :publishing, -> { where(status: Status::PUBLISHING) } scope :published, -> { where(status: Status::PUBLISHED) } scope :failed, -> { where(status: Status::FAILED) } diff --git a/lib/outboxer/publisher.rb b/lib/outboxer/publisher.rb index 26fd9b6a..ce1378b3 100644 --- a/lib/outboxer/publisher.rb +++ b/lib/outboxer/publisher.rb @@ -191,24 +191,24 @@ def create_publisher_threads(id:, name:, break if message.nil? publish_message( - id: id, name: name, dequeued_message: message, + id: id, name: name, buffered_message: message, logger: logger, process: process, kernel: kernel, &block) end end end end - def dequeue_messages(id:, name:, - queue:, buffer:, poll:, tick:, - signal_read:, logger:, process:, kernel:) - dequeue_limit = buffer - queue.size + def buffer_messages(id:, name:, + queue:, buffer:, poll:, tick:, + signal_read:, logger:, process:, kernel:) + buffer_limit = buffer - queue.size - if dequeue_limit > 0 - dequeued_messages = Messages.dequeue( - limit: dequeue_limit, publisher_id: id, publisher_name: name) + if buffer_limit > 0 + buffered_messages = Messages.buffer( + limit: buffer_limit, publisher_id: id, publisher_name: name) - if dequeued_messages.count > 0 - dequeued_messages.each { |message| queue.push(message) } + if buffered_messages.count > 0 + buffered_messages.each { |message| queue.push(message) } else Publisher.sleep( poll, @@ -410,7 +410,7 @@ def publish( loop do case @status when Status::PUBLISHING - dequeue_messages( + buffer_messages( id: id, name: name, queue: queue, buffer: buffer, poll: poll, tick:, @@ -445,14 +445,14 @@ def publish( database.disconnect(logger: logger) end - def publish_message(id:, name:, dequeued_message:, logger:, kernel:, process:, &block) - dequeued_at = process.clock_gettime(Process::CLOCK_MONOTONIC) + def publish_message(id:, name:, buffered_message:, logger:, kernel:, process:, &block) + buffered_at = process.clock_gettime(Process::CLOCK_MONOTONIC) message = Message.publishing( - id: dequeued_message[:id], publisher_id: id, publisher_name: name) + id: buffered_message[:id], publisher_id: id, publisher_name: name) logger.debug "Outboxer publishing message #{message[:id]} for "\ "#{message[:messageable_type]}::#{message[:messageable_id]} "\ - "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - dequeued_at).round(3)}s" + "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - buffered_at).round(3)}s" begin block.call(message) @@ -460,7 +460,7 @@ def publish_message(id:, name:, dequeued_message:, logger:, kernel:, process:, & Message.failed(id: message[:id], exception: e, publisher_id: id, publisher_name: name) logger.debug "Outboxer failed to publish message #{message[:id]} for "\ "#{message[:messageable_type]}::#{message[:messageable_id]} "\ - "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - dequeued_at).round(3)}s" + "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - buffered_at).round(3)}s" raise end @@ -468,7 +468,7 @@ def publish_message(id:, name:, dequeued_message:, logger:, kernel:, process:, & Message.published(id: message[:id], publisher_id: id, publisher_name: name) logger.debug "Outboxer published message #{message[:id]} for "\ "#{message[:messageable_type]}::#{message[:messageable_id]} "\ - "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - dequeued_at).round(3)}s" + "in #{(process.clock_gettime(Process::CLOCK_MONOTONIC) - buffered_at).round(3)}s" rescue StandardError => e logger.error( "#{e.class}: #{e.message}\n"\ diff --git a/lib/outboxer/web/views/error.erb b/lib/outboxer/web/views/error.erb index 8cf33e67..3f334f5d 100644 --- a/lib/outboxer/web/views/error.erb +++ b/lib/outboxer/web/views/error.erb @@ -26,7 +26,7 @@ Publishing
  • - Dequeued + Buffered
  • Queued diff --git a/lib/outboxer/web/views/home.erb b/lib/outboxer/web/views/home.erb index 1cde46cb..246be49a 100644 --- a/lib/outboxer/web/views/home.erb +++ b/lib/outboxer/web/views/home.erb @@ -122,7 +122,7 @@ - <% ['queued', 'dequeued', 'publishing', 'published', 'failed'].each do |status| %> + <% ['queued', 'buffered', 'publishing', 'published', 'failed'].each do |status| %> "> diff --git a/lib/outboxer/web/views/layout.erb b/lib/outboxer/web/views/layout.erb index 99be05b2..48d85422 100644 --- a/lib/outboxer/web/views/layout.erb +++ b/lib/outboxer/web/views/layout.erb @@ -64,7 +64,7 @@
      <% statuses = [ { name: 'Queued', key: 'queued' }, - { name: 'Dequeued', key: 'dequeued' }, + { name: 'Buffered', key: 'buffered' }, { name: 'Publishing', key: 'publishing' }, { name: 'Published', key: 'published' }, { name: 'Failed', key: 'failed' } diff --git a/spec/factories/outboxer_messages.rb b/spec/factories/outboxer_messages.rb index a1eb57e3..72cdd701 100644 --- a/spec/factories/outboxer_messages.rb +++ b/spec/factories/outboxer_messages.rb @@ -11,8 +11,8 @@ status { Outboxer::Models::Message::Status::QUEUED } end - trait :dequeued do - status { Outboxer::Models::Message::Status::DEQUEUED } + trait :buffered do + status { Outboxer::Models::Message::Status::BUFFERED } end trait :publishing do diff --git a/spec/lib/outboxer/message/can_requeue_spec.rb b/spec/lib/outboxer/message/can_requeue_spec.rb index 35336253..cce32ed3 100644 --- a/spec/lib/outboxer/message/can_requeue_spec.rb +++ b/spec/lib/outboxer/message/can_requeue_spec.rb @@ -5,7 +5,7 @@ module Outboxer RSpec.describe Message do describe '.can_requeue?' do let!(:message_1) { create(:outboxer_message, :queued) } - let!(:message_2) { create(:outboxer_message, :dequeued) } + let!(:message_2) { create(:outboxer_message, :buffered) } let!(:message_3) { create(:outboxer_message, :failed) } let!(:message_4) { create(:outboxer_message, :failed) } let!(:message_5) { create(:outboxer_message, :publishing) } @@ -16,9 +16,9 @@ module Outboxer end end - context 'when status is dequeued' do + context 'when status is buffered' do it 'returns true' do - expect(Message.can_requeue?(status: Message::Status::DEQUEUED)).to eq true + expect(Message.can_requeue?(status: Message::Status::BUFFERED)).to eq true end end diff --git a/spec/lib/outboxer/message/publishing_spec.rb b/spec/lib/outboxer/message/publishing_spec.rb index 69cee0d2..06d5d984 100644 --- a/spec/lib/outboxer/message/publishing_spec.rb +++ b/spec/lib/outboxer/message/publishing_spec.rb @@ -3,9 +3,9 @@ module Outboxer RSpec.describe Message do describe '.publishing' do - context 'when dequeued message' do - let!(:dequeued_message) { create(:outboxer_message, :dequeued) } - let!(:publishing_message) { Message.publishing(id: dequeued_message.id) } + context 'when buffered message' do + let!(:buffered_message) { create(:outboxer_message, :buffered) } + let!(:publishing_message) { Message.publishing(id: buffered_message.id) } it 'returns publishing message' do expect(publishing_message[:id]).to eq(Models::Message.publishing.last.id) diff --git a/spec/lib/outboxer/messages/dequeue_spec.rb b/spec/lib/outboxer/messages/buffer_spec.rb similarity index 71% rename from spec/lib/outboxer/messages/dequeue_spec.rb rename to spec/lib/outboxer/messages/buffer_spec.rb index b6a6a997..a8e1344f 100644 --- a/spec/lib/outboxer/messages/dequeue_spec.rb +++ b/spec/lib/outboxer/messages/buffer_spec.rb @@ -2,7 +2,7 @@ module Outboxer RSpec.describe Messages do - describe '.dequeue' do + describe '.buffer' do context 'when there are 2 queued messages' do let!(:queued_messages) do [ @@ -12,13 +12,13 @@ module Outboxer end context 'when limit is 1' do - let!(:dequeued_messages) { Messages.dequeue(limit: 1) } + let!(:buffered_messages) { Messages.buffer(limit: 1) } - it 'returns first dequeued message' do - expect(dequeued_messages.count).to eq(1) + it 'returns first buffered message' do + expect(buffered_messages.count).to eq(1) - dequeued_message = dequeued_messages.first - expect(dequeued_message[:id]).to eq(queued_messages[0].id) + buffered_message = buffered_messages.first + expect(buffered_message[:id]).to eq(queued_messages[0].id) end it 'keeps last queued message' do diff --git a/spec/lib/outboxer/messages/can_requeue_spec.rb b/spec/lib/outboxer/messages/can_requeue_spec.rb index e6aa4de3..a4e358c5 100644 --- a/spec/lib/outboxer/messages/can_requeue_spec.rb +++ b/spec/lib/outboxer/messages/can_requeue_spec.rb @@ -5,7 +5,7 @@ module Outboxer RSpec.describe Messages do describe '.can_requeue?' do let!(:message_1) { create(:outboxer_message, :queued) } - let!(:message_2) { create(:outboxer_message, :dequeued) } + let!(:message_2) { create(:outboxer_message, :buffered) } let!(:message_3) { create(:outboxer_message, :failed) } let!(:message_4) { create(:outboxer_message, :failed) } let!(:message_5) { create(:outboxer_message, :publishing) } @@ -16,9 +16,9 @@ module Outboxer end end - context 'when status is dequeued' do + context 'when status is buffered' do it 'returns true' do - expect(Messages.can_requeue?(status: Message::Status::DEQUEUED)).to eq true + expect(Messages.can_requeue?(status: Message::Status::BUFFERED)).to eq true end end diff --git a/spec/lib/outboxer/messages/delete_all_spec.rb b/spec/lib/outboxer/messages/delete_all_spec.rb index 821911ee..79967b52 100644 --- a/spec/lib/outboxer/messages/delete_all_spec.rb +++ b/spec/lib/outboxer/messages/delete_all_spec.rb @@ -17,7 +17,7 @@ module Outboxer end let!(:message_1) { create(:outboxer_message, :queued) } - let!(:message_2) { create(:outboxer_message, :dequeued) } + let!(:message_2) { create(:outboxer_message, :buffered) } let!(:message_3) { create(:outboxer_message, :failed) } let!(:exception_1) { create(:outboxer_exception, message: message_3) } @@ -54,9 +54,9 @@ module Outboxer end end - context 'when status is dequeued' do + context 'when status is buffered' do before do - Messages.delete_all(status: Message::Status::DEQUEUED, batch_size: 1) + Messages.delete_all(status: Message::Status::BUFFERED, batch_size: 1) end it 'deletes queued messages' do diff --git a/spec/lib/outboxer/messages/delete_by_ids_spec.rb b/spec/lib/outboxer/messages/delete_by_ids_spec.rb index 753ca349..3ed73f16 100644 --- a/spec/lib/outboxer/messages/delete_by_ids_spec.rb +++ b/spec/lib/outboxer/messages/delete_by_ids_spec.rb @@ -20,7 +20,7 @@ module Outboxer let!(:exception_1) { create(:outboxer_exception, message: message_1) } let!(:frame_1) { create(:outboxer_frame, exception: exception_1) } - let!(:message_2) { create(:outboxer_message, :dequeued) } + let!(:message_2) { create(:outboxer_message, :buffered) } let!(:exception_2) { create(:outboxer_exception, message: message_2) } let!(:frame_2) { create(:outboxer_frame, exception: exception_2) } diff --git a/spec/lib/outboxer/messages/list/filter_spec.rb b/spec/lib/outboxer/messages/list/filter_spec.rb index 5fe741d7..8302b59e 100644 --- a/spec/lib/outboxer/messages/list/filter_spec.rb +++ b/spec/lib/outboxer/messages/list/filter_spec.rb @@ -15,7 +15,7 @@ module Outboxer end let!(:message_3) do - create(:outboxer_message, :dequeued, + create(:outboxer_message, :buffered, messageable_type: 'Event', messageable_id: '3', updated_by_publisher_id: 43000, updated_by_publisher_name: 'server-03:43000') end @@ -72,9 +72,9 @@ module Outboxer end end - context 'with dequeued status' do - it 'returns dequeued messages' do - expect(Messages.list(status: :dequeued)).to eq({ + context 'with buffered status' do + it 'returns buffered messages' do + expect(Messages.list(status: :buffered)).to eq({ current_page: 1, limit_value: 100, total_count: 1, total_pages: 1, messages: [ { diff --git a/spec/lib/outboxer/messages/list/no_arguments_spec.rb b/spec/lib/outboxer/messages/list/no_arguments_spec.rb index 71c67f05..c0bdfce3 100644 --- a/spec/lib/outboxer/messages/list/no_arguments_spec.rb +++ b/spec/lib/outboxer/messages/list/no_arguments_spec.rb @@ -16,7 +16,7 @@ module Outboxer end let!(:message_3) do - create(:outboxer_message, :dequeued, + create(:outboxer_message, :buffered, messageable_type: 'Event', messageable_id: '3', updated_by_publisher_id: 43000, updated_by_publisher_name: 'server-03:43000') end diff --git a/spec/lib/outboxer/messages/list/sort_spec.rb b/spec/lib/outboxer/messages/list/sort_spec.rb index 302025ab..073d29b9 100644 --- a/spec/lib/outboxer/messages/list/sort_spec.rb +++ b/spec/lib/outboxer/messages/list/sort_spec.rb @@ -11,7 +11,7 @@ module Outboxer end let!(:message_3) do - create(:outboxer_message, :dequeued, messageable_type: 'Event', messageable_id: '3') + create(:outboxer_message, :buffered, messageable_type: 'Event', messageable_id: '3') end let!(:message_4) do @@ -46,7 +46,7 @@ module Outboxer Messages .list(sort: :status, order: :asc)[:messages] .map { |message| message[:status] } - ).to eq([:dequeued, :failed, :publishing, :queued, :queued]) + ).to eq([:buffered, :failed, :publishing, :queued, :queued]) end it 'sorts messages by status in descending order' do @@ -54,7 +54,7 @@ module Outboxer Messages .list(sort: :status, order: :desc)[:messages] .map { |message| message[:status] } - ).to eq([:queued, :queued, :publishing, :failed, :dequeued]) + ).to eq([:queued, :queued, :publishing, :failed, :buffered]) end end diff --git a/spec/lib/outboxer/messages/metrics_spec.rb b/spec/lib/outboxer/messages/metrics_spec.rb index fb9e2260..1ad5986a 100644 --- a/spec/lib/outboxer/messages/metrics_spec.rb +++ b/spec/lib/outboxer/messages/metrics_spec.rb @@ -24,12 +24,12 @@ module Outboxer create(:outboxer_message, :queued, updated_at: 5.minutes.ago) end - let!(:oldest_dequeued_message) do - create(:outboxer_message, :dequeued, updated_at: 20.minutes.ago) + let!(:oldest_buffered_message) do + create(:outboxer_message, :buffered, updated_at: 20.minutes.ago) end - let!(:newest_dequeued_message) do - create(:outboxer_message, :dequeued, updated_at: 4.minutes.ago) + let!(:newest_buffered_message) do + create(:outboxer_message, :buffered, updated_at: 4.minutes.ago) end let!(:oldest_publishing_message) do @@ -68,9 +68,9 @@ module Outboxer latency: (current_utc_time - oldest_queued_message.updated_at.utc).to_i, throughput: 0, }, - dequeued: { + buffered: { count: { current: 2 }, - latency: (current_utc_time - oldest_dequeued_message.updated_at.utc).to_i, + latency: (current_utc_time - oldest_buffered_message.updated_at.utc).to_i, throughput: 0, }, publishing: { @@ -99,7 +99,7 @@ module Outboxer expect(metrics).to eq( all: { count: { current: 0 } }, queued: { count: { current: 0 }, latency: 0, throughput: 0 }, - dequeued: { count: { current: 0 }, latency: 0, throughput: 0 }, + buffered: { count: { current: 0 }, latency: 0, throughput: 0 }, publishing: { count: { current: 0 }, latency: 0, throughput: 0 }, published: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 }, failed: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 } @@ -114,7 +114,7 @@ module Outboxer expect(metrics).to eq( all: { count: { current: 0 } }, queued: { count: { current: 0 }, latency: 0, throughput: 0 }, - dequeued: { count: { current: 0 }, latency: 0, throughput: 0 }, + buffered: { count: { current: 0 }, latency: 0, throughput: 0 }, publishing: { count: { current: 0 }, latency: 0, throughput: 0 }, published: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 }, failed: { count: { historic: 0, current: 0, total: 0 }, latency: 0, throughput: 0 } diff --git a/spec/lib/outboxer/messages/requeue_all_spec.rb b/spec/lib/outboxer/messages/requeue_all_spec.rb index 980a1b6a..8f57e5ad 100644 --- a/spec/lib/outboxer/messages/requeue_all_spec.rb +++ b/spec/lib/outboxer/messages/requeue_all_spec.rb @@ -4,7 +4,7 @@ module Outboxer RSpec.describe Messages do describe '.requeue_all' do let!(:message_1) { create(:outboxer_message, :queued) } - let!(:message_2) { create(:outboxer_message, :dequeued) } + let!(:message_2) { create(:outboxer_message, :buffered) } let!(:message_3) { create(:outboxer_message, :failed) } let!(:message_4) { create(:outboxer_message, :failed) } let!(:message_5) { create(:outboxer_message, :publishing) } @@ -21,9 +21,9 @@ module Outboxer end end - context 'when status is dequeued' do + context 'when status is buffered' do before do - Messages.requeue_all(status: Message::Status::DEQUEUED, batch_size: 1) + Messages.requeue_all(status: Message::Status::BUFFERED, batch_size: 1) end it 'sets queued messages to queued' do @@ -49,7 +49,7 @@ module Outboxer it 'raises ArgumentError with message' do expect do Messages.requeue_all(status: nil, batch_size: 1) - end.to raise_error(ArgumentError, "Status nil must be one of dequeued, publishing, failed") + end.to raise_error(ArgumentError, "Status nil must be one of buffered, publishing, failed") end end end diff --git a/spec/lib/outboxer/publisher/publish_spec.rb b/spec/lib/outboxer/publisher/publish_spec.rb index b80b27f9..5ccab3e3 100644 --- a/spec/lib/outboxer/publisher/publish_spec.rb +++ b/spec/lib/outboxer/publisher/publish_spec.rb @@ -150,7 +150,7 @@ module Outboxer logger: logger, database: database, kernel: kernel - ) do |dequeued_message| + ) do |buffered_message| raise no_memory_error end end @@ -181,11 +181,11 @@ module Outboxer end end - context 'when Messages.dequeue raises a StandardError' do + context 'when Messages.buffer raises a StandardError' do it 'logs the error and continues processing' do call_count = 0 - allow(Messages).to receive(:dequeue) do + allow(Messages).to receive(:buffer) do call_count += 1 case call_count @@ -211,9 +211,9 @@ module Outboxer end end - context 'when Messages.dequeue raises an Exception' do + context 'when Messages.buffer raises an Exception' do it 'logs the exception and shuts down' do - allow(Messages).to receive(:dequeue) + allow(Messages).to receive(:buffer) .and_raise(NoMemoryError, 'failed to allocate memory') expect(logger).to receive(:fatal)