aggregate: When run with --aggregate, if an aggregation is already running, don't...

This way, if a previous aggregation job is running, we don't add additional
load doing work that job will do anyway.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 83bd670cb449f017ce9c35b81262af29ccdb6883..89da5c453aa7e36143ad46271d053f446215b15d 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -113,8 +113,7 @@ sub launchaggregation () {
        my @feeds=needsaggregate();
        return unless @feeds;
        if (! lockaggregate()) {
-               debug("an aggregation process is already running");
-               return;
+               error("an aggregation process is already running");
        }
        # force a later rebuild of source pages
        $IkiWiki::forcerebuild{$_->{sourcepage}}=1

diff --git a/debian/changelog b/debian/changelog
index abc40a163d068a23f446fd218f13f68533cbb210..6f13b2dd564e9c4a37591dc77383e259ee7ee905 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20121213) UNRELEASED; urgency=low
 
   * htmlscrubber: Allow the bitcoin URI scheme.
+  * aggregate: When run with --aggregate, if an aggregation is already
+    running, don't go on and --refresh.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400