aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-12-27 21:25:59 -0400
committerJoey Hess <joey@kitenet.net>2012-12-27 21:25:59 -0400
commitdc05125b0bdd7c579e36203ce2b16c86f6d8092f (patch)
treed9ef8dfa9412687da9b1c193d8fbf6f14102081b /IkiWiki
parentb2ff098ae992f6b9e5d4b75d47b7ffa85d07d119 (diff)
downloadikiwiki-dc05125b0bdd7c579e36203ce2b16c86f6d8092f.tar
ikiwiki-dc05125b0bdd7c579e36203ce2b16c86f6d8092f.tar.gz
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.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/aggregate.pm3
1 files changed, 1 insertions, 2 deletions
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