We must preserve the umask for the entirety of the indexing
operation, as Xapian transactions replace entire files
atomically instead of writing them in place.
my $dir = $class->xdir($git_dir);
require Search::Xapian::WritableDatabase;
my $flag = Search::Xapian::DB_OPEN;
my $dir = $class->xdir($git_dir);
require Search::Xapian::WritableDatabase;
my $flag = Search::Xapian::DB_OPEN;
- if ($writable == 1) {
- require File::Path;
- File::Path::mkpath($dir);
- $flag = Search::Xapian::DB_CREATE_OR_OPEN;
- }
my $self = bless { git_dir => $git_dir }, $class;
my $self = bless { git_dir => $git_dir }, $class;
- my $umask = _umask_for($self->_git_config_perm);
- my $old_umask = umask $umask;
- my $db = eval { Search::Xapian::WritableDatabase->new($dir, $flag) };
- my $err = $@;
- umask $old_umask;
- die $err if $err;
- $self->{xdb} = $db;
+ my $perm = $self->_git_config_perm;
+ my $umask = _umask_for($perm);
+ $self->{umask} = $umask;
+ $self->{xdb} = $self->with_umask(sub {
+ if ($writable == 1) {
+ require File::Path;
+ File::Path::mkpath($dir);
+ $flag = Search::Xapian::DB_CREATE_OR_OPEN;
+ }
+ Search::Xapian::WritableDatabase->new($dir, $flag);
+ });
-# indexes all unindexed messages
+ my ($self, $head) = @_;
+ $self->with_umask(sub { $self->_index_sync($head) });
+}
+
+# indexes all unindexed messages
+sub _index_sync {
my ($self, $head) = @_;
require PublicInbox::GitCatFile;
my $db = $self->{xdb};
my ($self, $head) = @_;
require PublicInbox::GitCatFile;
my $db = $self->{xdb};
+sub with_umask {
+ my ($self, $cb) = @_;
+ my $old = umask $self->{umask};
+ my $rv = eval { $cb->() };
+ my $err = $@;
+ umask $old;
+ die $err if $@;
+ $rv;
+}
+
sub search_index_sync {
my ($git_dir) = @_;
eval {
sub search_index_sync {
my ($git_dir) = @_;
eval {
- require PublicInbox::Search;
+ require PublicInbox::SearchIdx;
PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
};
}
PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;
};
}