diff options
| author | Joey Hess <joey@kitenet.net> | 2012-12-27 21:25:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-27 21:25:59 -0400 |
| commit | dc05125b0bdd7c579e36203ce2b16c86f6d8092f (patch) | |
| tree | d9ef8dfa9412687da9b1c193d8fbf6f14102081b | |
| parent | b2ff098ae992f6b9e5d4b75d47b7ffa85d07d119 (diff) | |
| download | ikiwiki-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.
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 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 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 <joeyh@debian.org> Sat, 22 Dec 2012 16:15:24 -0400 |