From: Joey Hess Date: Fri, 28 Dec 2012 01:25:59 +0000 (-0400) Subject: aggregate: When run with --aggregate, if an aggregation is already running, don't... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dc05125b0bdd7c579e36203ce2b16c86f6d8092f;p=ikiwiki.git aggregate: When run with --aggregate, if an aggregation is already running, don't go on and --refresh. 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 83bd670cb..89da5c453 100644 --- 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 abc40a163..6f13b2dd5 100644 --- 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 Sat, 22 Dec 2012 16:15:24 -0400