Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / pinger.pm

diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index c20ecb5d4ef3a663f5496135f56ddb5369c5dd87..b2d54af8ac269cd63e95913073919cfd2b496052 100644 (file)
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -13,7 +13,7 @@ sub import {
        hook(type => "needsbuild", id => "pinger", call => \&needsbuild);
        hook(type => "preprocess", id => "ping", call => \&preprocess);
        hook(type => "delete", id => "pinger", call => \&ping);
        hook(type => "needsbuild", id => "pinger", call => \&needsbuild);
        hook(type => "preprocess", id => "ping", call => \&preprocess);
        hook(type => "delete", id => "pinger", call => \&ping);

-       hook(type => "change", id => "pinger", call => \&ping);
+       hook(type => "rendered", id => "pinger", call => \&ping);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -45,6 +45,7 @@ sub needsbuild (@) {
                        }
                }
        }
                        }
                }
        }

+       return $needsbuild;

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {


@@ -66,10 +67,12 @@ sub ping {
        if (! $pinged && %pages) {
                $pinged=1;
                
        if (! $pinged && %pages) {
                $pinged=1;
                

+               eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
+               

                my $ua;
                eval q{use LWPx::ParanoidAgent};
                if (!$@) {
                my $ua;
                eval q{use LWPx::ParanoidAgent};
                if (!$@) {

-                       $ua=LWPx::ParanoidAgent->new;
+                       $ua=LWPx::ParanoidAgent->new(agent => $config{useragent});

                }
                else {
                        eval q{use LWP};
                }
                else {
                        eval q{use LWP};


@@ -77,7 +80,7 @@ sub ping {
                                debug(gettext("LWP not found, not pinging"));
                                return;
                        }
                                debug(gettext("LWP not found, not pinging"));
                                return;
                        }

-                       $ua=LWP::UserAgent->new;
+                       $ua=useragent();

                }
                $ua->timeout($config{pinger_timeout} || 15);
                
                }
                $ua->timeout($config{pinger_timeout} || 15);
                


@@ -105,6 +108,8 @@ sub ping {
                        # only ping when a page was changed, so a ping loop
                        # will still be avoided.
                        next if $url=~/^\Q$config{cgiurl}\E/;
                        # only ping when a page was changed, so a ping loop
                        # will still be avoided.
                        next if $url=~/^\Q$config{cgiurl}\E/;

+                       my $local_cgiurl = IkiWiki::cgiurl();
+                       next if $url=~/^\Q$local_cgiurl\E/;

                        
                        $ua->get($url);
                }
                        
                        $ua->get($url);
                }