diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 04:26:29 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 04:26:29 +0100 |
| commit | 6b69ddd17a9fe75544ce32b402042f2d50826874 (patch) | |
| tree | c8fbfa365ece78aeb557e7a501ec168e6d720f33 /synapse | |
| parent | Manually generate the default config yaml, remove most of the commandline arg... (diff) | |
| download | synapse-6b69ddd17a9fe75544ce32b402042f2d50826874.tar.xz | |
remove duplicate parse_size method
Diffstat (limited to 'synapse')
| -rwxr-xr-x | synapse/app/homeserver.py | 1 | ||||
| -rw-r--r-- | synapse/config/repository.py | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index c16dd8acc3..e6a34561c1 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -406,7 +406,6 @@ def setup(config_options): redirect_root_to_web_client=True, ) - logger.info("Preparing database: %r...", config.database_config) try: diff --git a/synapse/config/repository.py b/synapse/config/repository.py index bf727285d7..adaf4e4bb2 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -22,15 +22,6 @@ class ContentRepositoryConfig(Config): self.max_image_pixels = self.parse_size(config["max_image_pixels"]) self.media_store_path = self.ensure_directory(config["media_store_path"]) - def parse_size(self, 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 - def default_config(self, config_dir_path, server_name): media_store = self.default_path("media_store") return """ |