Use correct time unit for default session timeout

The timeout unit should still be in milliseconds as per Ie279ad8f, but
we need to convert the default timeout value so it does not default to
720ms.

Change-Id: I4a079934b405c85f964d34f9182d257a66d414fe
This commit is contained in:
Dave Borowitz
2013-03-12 17:29:24 -07:00
parent 64a828d5b0
commit 1c7383b782

View File

@@ -24,6 +24,7 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.writeString;
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 com.google.common.cache.Cache;
import com.google.gerrit.reviewdb.client.Account;
@@ -67,8 +68,8 @@ class WebSessionManager {
sessionMaxAgeMillis = ConfigUtil.getTimeUnit(cfg,
"cache", CACHE_NAME, "maxAge",
MAX_AGE_MINUTES, MILLISECONDS);
if (sessionMaxAgeMillis < TimeUnit.MINUTES.toMillis(5)) {
MILLISECONDS.convert(MAX_AGE_MINUTES, MINUTES), MILLISECONDS);
if (sessionMaxAgeMillis < MINUTES.toMillis(5)) {
log.warn(String.format(
"cache.%s.maxAge is set to %d milliseconds;" +
" it should be at least 5 minutes.",