X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAdmin.pm;h=3d0d80b92003347771b135cbeab47c6444d510c5;hb=56643bfddba2f7bca60955e5c48435fe58cc8e1c;hp=8a2f20431c1ba403bbfc6a95dbe6c9dbd443105d;hpb=d9aad3a7988262b31ab2171f2c982daf04ac822c;p=public-inbox.git

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 8a2f2043..3d0d80b9 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -9,7 +9,6 @@ use warnings;
 use Cwd 'abs_path';
 use base qw(Exporter);
 our @EXPORT_OK = qw(resolve_repo_dir);
-my $CFG; # all the admin stuff is a singleton
 require PublicInbox::Config;
 
 sub resolve_repo_dir {
@@ -35,7 +34,7 @@ sub resolve_repo_dir {
 			local $/;
 			<$fh>;
 		};
-		close $fh or die "error in $cmd: $!\n";
+		close $fh or die "error in $cmd (cwd:$cd): $!\n";
 		chomp $dir;
 		$$ver = 1 if $ver;
 		return abs_path($cd) if ($dir eq '.' && defined $cd);
@@ -61,7 +60,7 @@ sub detect_indexlevel ($) {
 			$l = $m;
 		} elsif ($m ne '') {
 			warn <<"";
-$ibx->{mainrepo} has unexpected indexlevel in Xapian: $m
+$ibx->{inboxdir} has unexpected indexlevel in Xapian: $m
 
 		}
 	}
@@ -74,20 +73,18 @@ sub unconfigured_ibx ($$) {
 	PublicInbox::Inbox->new({
 		name => $name,
 		address => [ "$name\@example.com" ],
-		mainrepo => $dir,
+		inboxdir => $dir,
 		# TODO: consumers may want to warn on this:
 		#-unconfigured => 1,
 	});
 }
 
-sub config () { $CFG //= eval { PublicInbox::Config->new } }
-
-sub resolve_inboxes ($;$) {
-	my ($argv, $opt) = @_;
+sub resolve_inboxes ($;$$) {
+	my ($argv, $opt, $cfg) = @_;
 	require PublicInbox::Inbox;
 	$opt ||= {};
 
-	my $cfg = config();
+	$cfg //= eval { PublicInbox::Config->new };
 	if ($opt->{all}) {
 		my $cfgfile = PublicInbox::Config::default_file();
 		$cfg or die "--all specified, but $cfgfile not readable\n";
@@ -101,7 +98,14 @@ sub resolve_inboxes ($;$) {
 		$cfg->each_inbox(sub {
 			my ($ibx) = @_;
 			$ibx->{version} ||= 1;
-			$dir2ibx{abs_path($ibx->{mainrepo})} = $ibx;
+			my $path = abs_path($ibx->{inboxdir});
+			if (defined($path)) {
+				$dir2ibx{$path} = $ibx;
+			} else {
+				warn <<EOF;
+W: $ibx->{name} $ibx->{inboxdir}: $!
+EOF
+			}
 		});
 	}
 	if ($opt->{all}) {
@@ -132,7 +136,7 @@ sub resolve_inboxes ($;$) {
 }
 
 # TODO: make Devel::Peek optional, only used for daemon
-my @base_mod = qw(Email::MIME Date::Parse Devel::Peek);
+my @base_mod = qw(Email::MIME Devel::Peek);
 my @over_mod = qw(DBD::SQLite DBI);
 my %mod_groups = (
 	-index => [ @base_mod, @over_mod ],
@@ -192,22 +196,22 @@ invalid indexlevel=$indexlevel (must be `basic', `medium', or `full')
 }
 
 sub index_inbox {
-	my ($ibx, $opt) = @_;
+	my ($ibx, $im, $opt) = @_;
 	my $jobs = delete $opt->{jobs} if $opt;
 	if (ref($ibx) && ($ibx->{version} || 1) == 2) {
 		eval { require PublicInbox::V2Writable };
 		die "v2 requirements not met: $@\n" if $@;
-		my $v2w = eval { $ibx->importer(0) } || eval {
+		my $v2w = $im // eval { $ibx->importer(0) } || eval {
 			PublicInbox::V2Writable->new($ibx, {nproc=>$jobs});
 		};
 		if (defined $jobs) {
 			if ($jobs == 0) {
 				$v2w->{parallel} = 0;
 			} else {
-				my $n = $v2w->{partitions};
-				if ($jobs != ($n + 1)) {
+				my $n = $v2w->{shards};
+				if ($jobs != ($n + 1) && !$opt->{reshard}) {
 					warn
-"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
+"Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
 				}
 			}
 		}