diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
| commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
| tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /synapse/config/_base.py | |
| parent | Merge branch 'erikj/ldap3_auth' (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz | |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index af9f17bf7b..1ab5593c6e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -64,11 +64,12 @@ class Config(object): if isinstance(value, int) or isinstance(value, long): return value second = 1000 - hour = 60 * 60 * second + minute = 60 * second + hour = 60 * minute day = 24 * hour week = 7 * day year = 365 * day - sizes = {"s": second, "h": hour, "d": day, "w": week, "y": year} + sizes = {"s": second, "m": minute, "h": hour, "d": day, "w": week, "y": year} size = 1 suffix = value[-1] if suffix in sizes: |