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 {
my ($cd, $ver) = @_;
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);
$l = $m;
} elsif ($m ne '') {
warn <<"";
-$ibx->{mainrepo} has unexpected indexlevel in Xapian: $m
+$ibx->{inboxdir} has unexpected indexlevel in Xapian: $m
}
}
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) = @_;
- require PublicInbox::Config;
require PublicInbox::Inbox;
$opt ||= {};
- my $config = eval { PublicInbox::Config->new };
+ my $cfg = config();
if ($opt->{all}) {
my $cfgfile = PublicInbox::Config::default_file();
- $config or die "--all specified, but $cfgfile not readable\n";
+ $cfg or die "--all specified, but $cfgfile not readable\n";
@$argv and die "--all specified, but directories specified\n";
}
my $min_ver = $opt->{-min_inbox_version} || 0;
my (@old, @ibxs);
my %dir2ibx;
- if ($config) {
- $config->each_inbox(sub {
+ if ($cfg) {
+ $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}) {
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";
}
}
}