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 ea4f3e0dc563bac69a999ed42b4884f48b1892a7..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 () {


@@ -72,7 +72,7 @@ sub ping {
                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};


@@ -80,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);