@@ -, +, @@ message_queue based on letter_code . INSERT INTO message_queue(borrowernumber,letter_code,message_transport_type,status,time_queued) VALUES(1,,'email','sent','2018-01-01 00:00:42'); 3.1) Messages older than 1 day should have been deleted --- misc/cronjobs/cleanup_database.pl | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) --- a/misc/cronjobs/cleanup_database.pl +++ a/misc/cronjobs/cleanup_database.pl @@ -57,6 +57,9 @@ Usage: $0 [-h|--help] [--sessions] [--sessdays DAYS] [-v|--verbose] [--zebraqueu Defaults to 30 days if no days specified. -m --mail DAYS purge items from the mail queue that are older than DAYS days. Defaults to 30 days if no days specified. + --keep-lc LC[,LC]* only used in conjunction with -m/--mail. + Keeps certain emails in the message_queue based on a + comma-separated list of LETTER_CODES --merged purged completed entries from need_merge_authorities. --import DAYS purge records from import tables older than DAYS days. Defaults to 60 days if no days specified. @@ -92,6 +95,7 @@ my $sess_days; my $verbose; my $zebraqueue_days; my $mail; +my $letter_codes; my $purge_merged; my $pImport; my $pLogs; @@ -115,6 +119,7 @@ GetOptions( 'sessdays:i' => \$sess_days, 'v|verbose' => \$verbose, 'm|mail:i' => \$mail, + 'keep-lc:s' => \$letter_codes, 'zebraqueue:i' => \$zebraqueue_days, 'merged' => \$purge_merged, 'import:i' => \$pImport, @@ -176,6 +181,11 @@ if ($pDebarments && $allDebarments) { usage(1); } +if (!$mail && $letter_codes) { + print "You should not specify --keep-lc if you're not cleaning emails.\n\n"; + usage(1); +} + cronlogaction(); my $dbh = C4::Context->dbh(); @@ -224,13 +234,19 @@ if ($zebraqueue_days) { if ($mail) { print "Mail queue purge triggered for $mail days.\n" if $verbose; - $sth = $dbh->prepare( - q{ - DELETE FROM message_queue - WHERE time_queued < date_sub(curdate(), INTERVAL ? DAY) - } - ); - $sth->execute($mail) or die $dbh->errstr; + print "Not deleting emails of type $letter_codes.\n" if ($verbose && $letter_codes); + my $query = q{ + DELETE FROM message_queue + WHERE time_queued < date_sub(curdate(), INTERVAL ? DAY) + AND letter_code NOT IN ( ? ) + }; + my $quoted_codes = ''; + if ($letter_codes) { + my @codes = map { "'$_'" } split(',', $letter_codes); + my $quoted_codes = join(',', @codes); + } + $sth = $dbh->prepare($query); + $sth->execute($mail, $quoted_codes) or die $dbh->errstr; $count = $sth->rows; $sth->finish; print "$count messages were deleted from the mail queue.\nDone with message_queue purge.\n" if $verbose; --