From 5e13d7d0526d7bbd078ce244cbd81709f9246965 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Fri, 12 May 2017 15:07:56 +0100 Subject: [PATCH] hold incoming messages when in development mode (not very dry but this unqueueing logic could do with some tidying) --- app/jobs/unqueue_message_job.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/jobs/unqueue_message_job.rb b/app/jobs/unqueue_message_job.rb index 9df308c..f0a7f04 100644 --- a/app/jobs/unqueue_message_job.rb +++ b/app/jobs/unqueue_message_job.rb @@ -145,6 +145,15 @@ class UnqueueMessageJob < Postal::Job next end + # If the server is in development mode, hold it + if queued_message.server.mode == 'Development' && !queued_message.manual? + log "Server is in development mode so holding." + queued_message.message.create_delivery('Held', :details => "Server is in development mode.") + queued_message.destroy + log "#{log_prefix} Server is in development mode. Holding." + next + end + # # Find out what sort of message we're supposed to be sending and dispatch this request over to # the sender. @@ -355,7 +364,7 @@ class UnqueueMessageJob < Postal::Job # If the server is in development mode, hold it if queued_message.server.mode == 'Development' && !queued_message.manual? - log "Server is in development mode and this is a outgoing message so holding." + log "Server is in development mode so holding." queued_message.message.create_delivery('Held', :details => "Server is in development mode.") queued_message.destroy log "#{log_prefix} Server is in development mode. Holding."