@@ -, +, @@ 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 | 40 ++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 14 deletions(-) --- a/misc/cronjobs/cleanup_database.pl +++ a/misc/cronjobs/cleanup_database.pl @@ -71,6 +71,9 @@ Usage: $0 [-h|--help] [--confirm] [--sessions] [--sessdays DAYS] [-v|--verbose] 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. --messages DAYS purge entries from messages table older than DAYS days. Defaults to 365 days if no days specified. @@ -133,6 +136,7 @@ my $sess_days; my $verbose; my $zebraqueue_days; my $mail; +my $letter_codes; my $purge_merged; my $pImport; my $pLogs; @@ -178,6 +182,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, @@ -284,6 +289,11 @@ say "Confirm flag not passed, running in dry-run mode..." unless $confirm; cronlogaction({ info => $command_line_options }); +if (!$mail && $letter_codes) { + print "You should not specify --keep-lc if you're not cleaning emails.\n\n"; + usage(1); +} + my $dbh = C4::Context->dbh(); my $sth; my $sth2; @@ -337,20 +347,22 @@ if ($zebraqueue_days) { if ($mail) { my $count = 0; 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) - } - ); - if ( $confirm ) { - $sth->execute($mail) or die $dbh->errstr; - $count = $sth->rows; - } - if ( $verbose ) { - say $confirm ? "$count messages were deleted from the mail queue." : "Message from message_queue would have been deleted"; - say "Done with message_queue purge."; - } + 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; } if ($purge_merged) { --