Skip to content

Remove raw messages when retention is disabled #3517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matige wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove raw messages when retention is disabled #3517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/lib/message_dequeuer/outgoing_message_processor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def process
remove_recipient_from_suppression_list_on_success
log_sender_result
finish_processing
cleanup_raw_message
end
rescue StandardError => e
handle_exception(e)
Expand Down Expand Up @@ -186,5 +187,11 @@ def finish_processing
remove_from_queue
end

def cleanup_raw_message
return if queued_message.server.raw_message_retention_days.to_i > 0 && queued_message.server.raw_message_retention_size.to_i > 0
queued_message.message.delete_raw_message
log "raw message removed due to retention settings"
end

end
end
11 changes: 11 additions & 0 deletions lib/postal/message_db/message.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,17 @@ def save_raw_message
@database.query("UPDATE `#{@database.database_name}`.`raw_message_sizes` SET size = size + #{size} WHERE table_name = '#{table_name}'")
end

#
# Delete the raw message from the database
#
def delete_raw_message
return unless raw_table

@database.query("DELETE FROM `#{@database.database_name}`.`#{raw_table}` WHERE id IN (#{raw_headers_id}, #{raw_body_id})")
@database.query("UPDATE `#{@database.database_name}`.`raw_message_sizes` SET size = size - #{size} WHERE table_name = '#{raw_table}'")
update(raw_table: nil, raw_headers_id: nil, raw_body_id: nil, size: nil)
end

#
# Is there a raw message?
#
Expand Down