* Catch failing IPC::Open2 in tidy plugin and retry in case this is a

  transient failure to fork (which I've seen happen in the wild).

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index e3929731991ab1e9c37fd1f7d4910d42ee820e4d..eb8f9d3d37efb4037d53ee7a23bcae168a5b8826 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -17,7 +17,18 @@ sub import { #{{{
 } # }}}
 
 sub sanitize ($) { #{{{
-       open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no') or return shift;
+       my $tries=10;
+       while (1) {
+               eval {
+                       open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
+               };
+               last unless $@;
+               $tries--;
+               if ($tries < 1) {
+                       IkiWiki::debug("failed to run tidy: $@");
+                       return shift;
+               }
+       }
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8'); 
        binmode (OUT, ':utf8'); 

diff --git a/debian/changelog b/debian/changelog
index 7ed15dcb191f08f82ffe902da2ac131ab973a8d5..a302b9ecf458db656656637efaeada53a9acd4fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ikiwiki (1.20) UNRELEASED; urgency=low
     Since these can easily become part of other people's websites, they
     should be under as permissive a license as possible.
   * Add --syslog config option, to log to the syslog.
+  * Catch failing IPC::Open2 in tidy plugin and retry in case this is a
+    transient failure to fork (which I've seen happen in the wild).
 
- -- Joey Hess <joeyh@debian.org>  Wed, 16 Aug 2006 17:07:35 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 17 Aug 2006 14:43:02 -0400
 
 ikiwiki (1.19) unstable; urgency=low