Changeset 2394

Timestamp:

04/01/2008 05:08:13 AM (6 months ago)

Author:

Geert

Message:

Fixed another small cache bug. The requests config reads as follows: there is 1 out of {requests} chances that garbage collection will be triggered. However, setting requests to 1 would only give you 1 out of 2 chances. Not anymore.

Location:

trunk/system

Files:

• config/cache.php (modified) (1 diff)
• libraries/Cache.php (modified) (1 diff)

trunk/system/config/cache.php

@@ -22 +22 @@
  *  requests - Average number of cache requests that will processed before all expired
  *             caches are deleted. This is commonly referred to as "garbage collection".
- *             Setting this to a negative number will disable automatic garbage collection.
+ *             Setting this to 0 or a negative number will disable automatic garbage collection.
  */
 $config['default'] = array

trunk/system/libraries/Cache.php

@@ -82 +82 @@
                 if (self::$loaded !== TRUE)
                 {
-                        if (mt_rand(0, (int) $this->config['requests']) === 1)
+                        $this->config['requests'] = (int) $this->config['requests'];
+
+                        if ($this->config['requests'] > 0 AND mt_rand(1, $this->config['requests']) === 1)
                         {
                                 // Do garbage collection