Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / aggregate_locking.mdwn

diff --git a/doc/todo/aggregate_locking.mdwn b/doc/todo/aggregate_locking.mdwn
index 91df662a7125f85c1f0253f83cbdef9b5ddd648a..062f34ea33be223bb615dbdbd94c1055b4dc3ca4 100644 (file)
--- a/doc/todo/aggregate_locking.mdwn
+++ b/doc/todo/aggregate_locking.mdwn
@@ -1,4 +1,4 @@
-The [[plugin/aggregate]] plugin's locking is a suboptimal.
+The [[plugins/aggregate]] plugin's locking is a suboptimal.
 
 There should be no need to lock the wiki while aggregating -- it's annoying
 that long aggregate runs can block edits from happening. However, not
@@ -46,16 +46,12 @@ would be loaded, and there would be no reason to worry about aggregating.
 
 Or aggregation could be kept in checkconfig, like so:
 
-* lock wiki
 * load aggregation state
-* unlock wiki
 * get list of feeds needing aggregation
 * exit if none
 * attempt to take aggregation lock, exit if another aggregation is happening
 * fork a child process to do the aggregation
-  * lock wiki
   * load wiki state (needed for aggregation to run)
-  * unlock wiki
   * aggregate
   * lock wiki
   * reload aggregation state
@@ -64,3 +60,5 @@ Or aggregation could be kept in checkconfig, like so:
 * drop aggregation lock
 * force rebuild of sourcepages of feeds that were aggregated
 * exit checkconfig and continue with usual refresh process
+
+[[done]]