OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1625 from DanielDent/patch-1 

Add support for durations in minutes
pull/1628/head
Erik Johnston 2016-11-12 11:20:46 +00:00 committed by GitHub
parent 6cc4fcf25c 1c93cd9f9f
commit 0964005d84
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/config/_base.py
View File

@ -64,11 +64,12 @@ class Config(object):
if isinstance(value, int) or isinstance(value, long): if isinstance(value, int) or isinstance(value, long):
return value return value
second = 1000 second = 1000
hour = 60 * 60 * second minute = 60 * second
hour = 60 * minute
day = 24 * hour day = 24 * hour
week = 7 * day week = 7 * day
year = 365 * 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 size = 1
suffix = value[-1] suffix = value[-1]
if suffix in sizes: if suffix in sizes: