Add modified opengraph plugin.

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

diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index cc9f52d2b50e7e880882ff56b89d8bafba5c274d..ec764caeea27ad00d6c5a878c5d6d2b0f814988d 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 => "change", id => "pinger", call => \&ping);
+       hook(type => "rendered", id => "pinger", call => \&ping);
 }
 
 sub getsetup () {
@@ -67,18 +67,19 @@ sub ping {
        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 (!$@) {
-                       $ua=LWPx::ParanoidAgent->new;
-               }
-               else {
-                       eval q{use LWP};
-                       if ($@) {
-                               debug(gettext("LWP not found, not pinging"));
-                               return;
-                       }
-                       $ua=LWP::UserAgent->new;
+               eval {
+                       # We pass the for_url parameter, even though it's
+                       # undef, because that will make sure we crash if used
+                       # with an older IkiWiki.pm that didn't automatically
+                       # try to use LWPx::ParanoidAgent.
+                       $ua=useragent(for_url => undef);
+               };
+               if ($@) {
+                       debug(gettext("LWP not found, not pinging").": $@");
+                       return;
                }
                $ua->timeout($config{pinger_timeout} || 15);
                
@@ -106,6 +107,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/;
+                       my $local_cgiurl = IkiWiki::cgiurl();
+                       next if $url=~/^\Q$local_cgiurl\E/;
                        
                        $ua->get($url);
                }