X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b144831e462e0d2ba8225f6e5f7d9138efb03c77..be954ff3cbc34d8b96a10f64c1279ce6b2f02671:/IkiWiki/Plugin/pinger.pm

diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index c6fa76e3f..c20ecb5d4 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -3,19 +3,35 @@ package IkiWiki::Plugin::pinger;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %pages;
 my $pinged=0;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "pinger", call => \&getsetup);
 	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);
-} # }}}
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+		pinger_timeout => {
+			type => "integer",
+			example => 15,
+			description => "how many seconds to try pinging before timing out",
+			safe => 1,
+			rebuild => 0,
+		},
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{pinger}) {
@@ -29,12 +45,12 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	if (! exists $params{from} || ! exists $params{to}) {
-		return "[[ping ".gettext("requires 'from' and 'to' parameters")."]]";
+		error gettext("requires 'from' and 'to' parameters");
 	}
 	if ($params{from} eq $config{url}) {
 		$pagestate{$params{destpage}}{pinger}{$params{to}}=1;
@@ -44,7 +60,7 @@ sub preprocess (@) { #{{{
 	else {
 		return sprintf(gettext("Ignoring ping directive for wiki %s (this wiki is %s)"), $params{from}, $config{url});
 	}
-} # }}}
+}
 
 sub ping {
 	if (! $pinged && %pages) {
@@ -90,7 +106,7 @@ sub ping {
 			# will still be avoided.
 			next if $url=~/^\Q$config{cgiurl}\E/;
 			
-			$ua->head($url);
+			$ua->get($url);
 		}
 		
 		exit 0;