wwwstream: eliminate ::response, use html_oneshot

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index c18c9c75b4ffee3a1fb865ca04d8ce6eda01d330..c0e2cc575ec640ff1532edcc16d501660e5e4f28 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -9,7 +9,7 @@
 
 package PublicInbox::Config;
 use strict;
-use warnings;
+use v5.10.1;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
 
@@ -105,13 +105,16 @@ sub iterate_start {
        $self->{-iter} = [ \$i, $cb, $arg ];
 }
 
-# for PublicInbox::DS::next_tick
+# for PublicInbox::DS::next_tick, we only call this is if
+# PublicInbox::DS is already loaded
 sub event_step {
        my ($self) = @_;
        my ($i, $cb, $arg) = @{$self->{-iter}};
        my $section = $self->{-section_order}->[$$i++];
        delete($self->{-iter}) unless defined($section);
-       $cb->($self, $section, $arg);
+       eval { $cb->($self, $section, $arg) };
+       warn "E: $@ in ${self}::event_step" if $@;
+       PublicInbox::DS::requeue($self) if defined($section);
 }
 
 sub lookup_newsgroup {
@@ -459,4 +462,23 @@ sub _fill {
        $ibx
 }
 
+sub urlmatch {
+       my ($self, $key, $url) = @_;
+       state $urlmatch_broken; # requires git 1.8.5
+       return if $urlmatch_broken;
+       my $file = default_file();
+       my $cmd = [qw/git config -z --includes --get-urlmatch/,
+               "--file=$file", $key, $url ];
+       my $fh = popen_rd($cmd);
+       local $/ = "\0";
+       my $val = <$fh>;
+       if (close($fh)) {
+               chomp($val);
+               $val;
+       } else {
+               $urlmatch_broken = 1 if (($? >> 8) != 1);
+               undef;
+       }
+}
+
 1;