diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
commit | f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4 (patch) | |
tree | 96cfd120f7bdb70c1045a8080f4f97f3a30bd574 /synapse/config/_base.py | |
parent | Minor tweaks based on PR feedback. (diff) | |
parent | Merge branch 'bugs/SYN-264' into develop (diff) | |
download | synapse-f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4.tar.xz |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r-- | synapse/config/_base.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 9b0f8c3c32..87cdbf1d30 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -28,6 +28,16 @@ class Config(object): pass @staticmethod + def parse_size(string): + sizes = {"K": 1024, "M": 1024 * 1024} + size = 1 + suffix = string[-1] + if suffix in sizes: + string = string[:-1] + size = sizes[suffix] + return int(string) * size + + @staticmethod def abspath(file_path): return os.path.abspath(file_path) if file_path else file_path |