* aggregate: Forking a child broke the one state that mattered: Forcing

  the aggregating page to be rebuilt. Fix this.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 2a4d10411dab8ac87655e6101f20f7dff1c8bd3f..736b0e0d5977c67428222c363ae29be9006fc34e 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -37,16 +37,19 @@ sub checkconfig () { #{{{
                        debug("wiki is locked by another process, not aggregating");
                        exit 1;
                }
                        debug("wiki is locked by another process, not aggregating");
                        exit 1;
                }

-               
+
+               loadstate();
+               my @feeds=needsaggregate();
+               return unless @feeds;
+

                # Fork a child process to handle the aggregation.
                # Fork a child process to handle the aggregation.

-               # The parent process will then handle building the result.
-               # This avoids messy code to clear state accumulated while
-               # aggregating.
+               # The parent process will then handle building the
+               # result. This avoids messy code to clear state
+               # accumulated while aggregating.

                defined(my $pid = fork) or error("Can't fork: $!");
                if (! $pid) {
                defined(my $pid = fork) or error("Can't fork: $!");
                if (! $pid) {

-                       loadstate();

                        IkiWiki::loadindex();
                        IkiWiki::loadindex();

-                       aggregate();
+                       aggregate(@feeds);

                        expire();
                        savestate();
                        exit 0;
                        expire();
                        savestate();
                        exit 0;


@@ -55,6 +58,8 @@ sub checkconfig () { #{{{
                if ($?) {
                        error "aggregation failed with code $?";
                }
                if ($?) {
                        error "aggregation failed with code $?";
                }

+               $IkiWiki::forcerebuild{$_->{sourcepage}}=1
+                       foreach @feeds;

                
                IkiWiki::unlockwiki();
        }
                
                IkiWiki::unlockwiki();
        }


@@ -254,7 +259,12 @@ sub expire () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub aggregate () { #{{{
+sub needsaggregate () { #{{{
+       return values %feeds if $config{rebuild};
+       return grep { time - $_->{lastupdate} >= $_->{updateinterval} } values %feeds;
+} #}}}
+
+sub aggregate (@) { #{{{

        eval q{use XML::Feed};
        error($@) if $@;
        eval q{use URI::Fetch};
        eval q{use XML::Feed};
        error($@) if $@;
        eval q{use URI::Fetch};


@@ -262,15 +272,12 @@ sub aggregate () { #{{{
        eval q{use HTML::Entities};
        error($@) if $@;
 
        eval q{use HTML::Entities};
        error($@) if $@;
 

-       foreach my $feed (values %feeds) {
-               next unless $config{rebuild} || 
-                       time - $feed->{lastupdate} >= $feed->{updateinterval};
+       foreach my $feed (@_) {

                $feed->{lastupdate}=time;
                $feed->{newposts}=0;
                $feed->{message}=sprintf(gettext("processed ok at %s"),
                        displaytime($feed->{lastupdate}));
                $feed->{error}=0;
                $feed->{lastupdate}=time;
                $feed->{newposts}=0;
                $feed->{message}=sprintf(gettext("processed ok at %s"),
                        displaytime($feed->{lastupdate}));
                $feed->{error}=0;

-               $IkiWiki::forcerebuild{$feed->{sourcepage}}=1;

 
                debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
 
 
                debug(sprintf(gettext("checking feed %s ..."), $feed->{name}));
 

diff --git a/debian/changelog b/debian/changelog
index b7096aec46212e04418b3f06648bd9207078dddc..df7b8b42498d4b7e5eb5ae154365fece8550cc92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (2.31) UNRELEASED; urgency=low
     that contributes to a page's content and using the youngest of them all,
     as well as special cases for things like the version plugin, and it's just
     too complex to do.
     that contributes to a page's content and using the youngest of them all,
     as well as special cases for things like the version plugin, and it's just
     too complex to do.

+  * aggregate: Forking a child broke the one state that mattered: Forcing
+    the aggregating page to be rebuilt. Fix this.

 
  -- Joey Hess <joeyh@debian.org>  Sat, 02 Feb 2008 23:36:31 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 02 Feb 2008 23:36:31 -0500