summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-29 15:50:57 +0100
committerGitHub <noreply@github.com>2016-06-29 15:50:57 +0100
commitaac546c978e40c832854eb48cefeddaebca12b3e (patch)
treec09ca640a0e61e65dc5913bf7d6c1b65f4d4de28 /synapse/server.py
parentMerge pull request #900 from RickCogley/RickCogley-coturn-readme-2 (diff)
parentRemove race (diff)
downloadsynapse-aac546c978e40c832854eb48cefeddaebca12b3e.tar.xz
Merge pull request #902 from matrix-org/erikj/expire_media
Feature: Implement purge_media_cache admin API
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index dd4b81c658..d49a1a8a96 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -45,6 +45,7 @@ from synapse.crypto.keyring import Keyring from synapse.push.pusherpool import PusherPool from synapse.events.builder import EventBuilderFactory from synapse.api.filtering import Filtering +from synapse.rest.media.v1.media_repository import MediaRepository from synapse.http.matrixfederationclient import MatrixFederationHttpClient @@ -113,6 +114,7 @@ class HomeServer(object): 'filtering', 'http_client_context_factory', 'simple_http_client', + 'media_repository', ] def __init__(self, hostname, **kwargs): @@ -233,6 +235,9 @@ class HomeServer(object): **self.db_config.get("args", {}) ) + def build_media_repository(self): + return MediaRepository(self) + def remove_pusher(self, app_id, push_key, user_id): return self.get_pusherpool().remove_pusher(app_id, push_key, user_id)