From 68230baf6e82ed54533734a7114b0d4509d2a149 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Tue, 15 Apr 2014 05:51:34 +0000
Subject: scripts/import_gmane_spool: preserve delivery order

Unfortunately, this means we get rid of parallelization,
as we need to preserve delivery order so HTML indices look
chronological.  Order may also affect spam filtering and
training, too.
---
 scripts/import_gmane_spool | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/import_gmane_spool b/scripts/import_gmane_spool
index e153ba4c..d96c26c8 100755
--- a/scripts/import_gmane_spool
+++ b/scripts/import_gmane_spool
@@ -16,21 +16,18 @@
 =cut
 use strict;
 use warnings;
-use Parallel::ForkManager;
 use Email::Simple;
 use PublicInbox::Filter;
 use PublicInbox::Config;
 use IPC::Run qw(run);
 sub usage { "Usage:\n".join("",grep(/\t/, `head -n 24 $0`)) }
 my $spool = shift @ARGV or die usage();
-my $nproc = `nproc 2>/dev/null` || 4;
-my $pm = Parallel::ForkManager->new($nproc);
 defined $ENV{RECIPIENT} or die usage();
 my @args = ('public-inbox-mda');
 
-foreach my $n (glob("$spool/*")) {
-	$n =~ m{/\d+\z} or next;
-	$pm->start and next;
+chdir $spool or die "chdir $spool failed: $!\n";
+
+foreach my $n (sort { $a <=> $b } grep(/\d+\z/, glob("*"))) {
 	if (open my $fh, '<', $n) {
 		my $s = eval {
 			local $/;
@@ -58,7 +55,4 @@ foreach my $n (glob("$spool/*")) {
 	} else {
 		warn "Failed to open $n: $!\n";
 	}
-	$pm->finish;
 }
-
-$pm->wait_all_children;
-- 
cgit v1.2.3-24-ge0c7