opendev/gerrit
Code Issues Proposed changes

Use SECONDS as default time unit for cache.web_sessions.maxAge

Browse Source 
DefaultCacheFactory already uses SECONDS as default time unit for
cache.*.maxAge.

Update the described default time unit for cache.*.maxAge in the
documentation.

Change-Id: Ibc1e4e8e8085292c313dd301de022687f0a453a4
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-03-12 16:04:37 +01:00
parent c4bb89050a
commit abcd504c0a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config-gerrit.txt
View File

@@ -419,7 +419,7 @@ Values should use common unit suffixes to express their setting:
* y, year, years (`1 year` is treated as `365 days`)
+
If a unit suffix is not specified, `minutes` is assumed. If 0 is
If a unit suffix is not specified, `seconds` is assumed. If 0 is
supplied, the maximum age is infinite and items are never purged
except when the cache is full.
+

5
gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java
View File

@@ -25,6 +25,7 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import com.google.common.cache.Cache;
import com.google.gerrit.reviewdb.client.Account;
@@ -66,9 +67,9 @@ class WebSessionManager {
prng = new SecureRandom();
self = cache;
sessionMaxAgeMillis = ConfigUtil.getTimeUnit(cfg,
sessionMaxAgeMillis = SECONDS.toMillis(ConfigUtil.getTimeUnit(cfg,
"cache", CACHE_NAME, "maxAge",
MILLISECONDS.convert(MAX_AGE_MINUTES, MINUTES), MILLISECONDS);
SECONDS.convert(MAX_AGE_MINUTES, MINUTES), SECONDS));
if (sessionMaxAgeMillis < MINUTES.toMillis(5)) {
log.warn(String.format(
"cache.%s.maxAge is set to %d milliseconds;" +