Merge "Support cache.web_sessions.maxAge < 1 minute"
This commit is contained in:
@@ -24,7 +24,6 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeString;
|
|||||||
import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32;
|
import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32;
|
||||||
import static java.util.concurrent.TimeUnit.HOURS;
|
import static java.util.concurrent.TimeUnit.HOURS;
|
||||||
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
import static java.util.concurrent.TimeUnit.MILLISECONDS;
|
||||||
import static java.util.concurrent.TimeUnit.MINUTES;
|
|
||||||
|
|
||||||
import com.google.common.cache.Cache;
|
import com.google.common.cache.Cache;
|
||||||
import com.google.gerrit.reviewdb.client.Account;
|
import com.google.gerrit.reviewdb.client.Account;
|
||||||
@@ -66,9 +65,9 @@ class WebSessionManager {
|
|||||||
prng = new SecureRandom();
|
prng = new SecureRandom();
|
||||||
self = cache;
|
self = cache;
|
||||||
|
|
||||||
sessionMaxAgeMillis = MINUTES.toMillis(ConfigUtil.getTimeUnit(cfg,
|
sessionMaxAgeMillis = ConfigUtil.getTimeUnit(cfg,
|
||||||
"cache", CACHE_NAME, "maxAge",
|
"cache", CACHE_NAME, "maxAge",
|
||||||
MAX_AGE_MINUTES, MINUTES));
|
MAX_AGE_MINUTES, MILLISECONDS);
|
||||||
if (sessionMaxAgeMillis < TimeUnit.MINUTES.toMillis(5)) {
|
if (sessionMaxAgeMillis < TimeUnit.MINUTES.toMillis(5)) {
|
||||||
log.warn(String.format(
|
log.warn(String.format(
|
||||||
"cache.%s.maxAge is set to %d milliseconds;" +
|
"cache.%s.maxAge is set to %d milliseconds;" +
|
||||||
|
|||||||
Reference in New Issue
Block a user