X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-submit;h=8a452adda8b01dd4197092987acbae9b2056b88b;hp=8025a78412e44e85daed4efbd5d26a35d747d5d7;hb=ba95562b1683631fd058e10bb8205dfecd3e3fe8;hpb=6e1cbd3c27c9eaa880b4af037e2b91d2678de1a7

diff --git a/perlmail-submit b/perlmail-submit
index 8025a78..8a452ad 100755
--- a/perlmail-submit
+++ b/perlmail-submit
@@ -15,15 +15,12 @@ use IO::Handle;
 use POSIX qw(mktime);
 use Fcntl qw(:flock);
 
-my $ExitCode;
-END {
-	exit $ExitCode if defined $ExitCode;
-	}
-
-my $Lock_pathname="/tmp/LaceMail.lock";
-my $PeerAddr="dejhome.dyn.jankratochvil.net.:852";
-my $Socket_timeout=600;	# 15sec is NOT enough!
-my $DB_table="LaceMail_folder";
+
+my $Lock_pathname="/tmp/PerlMail.lock";
+#my $PeerAddr="dejhome.dyn.jankratochvil.net.:852";
+my $PeerAddr="127.0.0.1:2852";
+my $Socket_timeout=7600;       # 15sec is NOT enough!
+my $DB_table="PerlMail_folder";
 my $DBI_database="short";
 my $DBI_user="short";
 my $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd";
@@ -69,6 +66,7 @@ sub store
 		local $/;
 		$message=<STDIN>;
 		}
+	close STDIN or cluck "close STDIN: $!";
 	my %row=(
 			"message"=>$message,
 			# assume "retries"=>0,
@@ -77,7 +75,14 @@ sub store
 			." values (".join(",",map("?",keys(%row))).")");
 	$prep->execute(values(%row));
 	print $prep->{"mysql_insertid"}."\n";
-	$ExitCode=0;	# we will succeed even if --submit fails
+}
+
+sub forkoff
+{
+	my $pid=fork();
+	confess if !defined $pid;
+	exit 0 if $pid;	# parent
+	# child
 }
 
 my $submitonce_run=0;
@@ -152,13 +157,52 @@ 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 time<from_unixtime(unix_timestamp()-$sec)");
+	$sth->execute();
+	if (!$print) {
+		print $sth->rows()."\n";
+		}
+	else {
+		while (my $row=$sth->fetchrow_hashref()) {
+			print $row->{"id"},"\n";
+			}
+		}
+}
+
 
 $Getopt::Long::ignorecase=0;
 die if !GetOptions(
 		  "initdb" ,\&initdb,
 		  "store"  ,\&store,
+		  "forkoff",\&forkoff,
 		  "submit" ,\&submit,
 		  "pending",\&pending,
-		"V|version",sub { print "lacemail-submit: $VERSION\n"; exit 0; },
+		  "clean:s",\&clean,
+		"V|version",sub { print "perlmail-submit: $VERSION\n"; exit 0; },
 		);
 exit 0;