X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-submit;h=782bb4dcced3e0aeeb141fa123904426b6a40c7a;hp=8025a78412e44e85daed4efbd5d26a35d747d5d7;hb=a891db31bc713711dc6503e8622f8249fd8a6371;hpb=6e1cbd3c27c9eaa880b4af037e2b91d2678de1a7 diff --git a/perlmail-submit b/perlmail-submit index 8025a78..782bb4d 100755 --- a/perlmail-submit +++ b/perlmail-submit @@ -152,6 +152,43 @@ sub pending } } +sub clean +{ +my($keyword,$interval)=@_; + + # FIXME: SQL "now()" is raced against the block above + my $sth=$DBI->prepare("select id,time,retries from $DB_table where time>now()"); + $sth->execute(); + while (my $row=$sth->fetchrow_hashref()) { + warn "Message time in future: ".join(",",map( + "$_=".(!defined $row->{$_} ? "NULL" : $row->{$_}) + ,keys(%$row))); + } + + return if $interval eq ""; + local $_=$interval; + my $print=s/^print://; + s/(\d+)y/($1*12)."m"/ge; + s/(\d+)m/($1*30)."d"/ge; + s/(\d+)d/($1*24)."h"/ge; + s/(\d+)h/($1*60)."M"/ge; + s/(\d+)M/($1*60)."s"/ge; + my $sec=0; + $sec+=$1 while s/(\d+)s//g; + die "Interval parse error; left \"$_\", parsed: $interval" if $_ ne ""; + $sth=$DBI->prepare(($print ? "select id" : "delete") + ." from $DB_table where retries is null and timeexecute(); + if (!$print) { + print $sth->rows()."\n"; + } + else { + while (my $row=$sth->fetchrow_hashref()) { + print $row->{"id"},"\n"; + } + } +} + $Getopt::Long::ignorecase=0; die if !GetOptions( @@ -159,6 +196,7 @@ die if !GetOptions( "store" ,\&store, "submit" ,\&submit, "pending",\&pending, + "clean:s",\&clean, "V|version",sub { print "lacemail-submit: $VERSION\n"; exit 0; }, ); exit 0;