summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 13:16:44 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 13:16:44 +0000
commit308ed5fa5c0695c55ccb7247b2a20e2cf758536c (patch)
tree35ac6cd7f8bf9ee845d5969b082090f274377f37
parentMinor fixes to user admin api (#6761) (diff)
parenta bit of debugging for media storage providers (#6757) (diff)
downloadsynapse-308ed5fa5c0695c55ccb7247b2a20e2cf758536c.tar.xz
a bit of debugging for media storage providers (#6757)
* commit '6b7462a13':
  a bit of debugging for media storage providers (#6757)
-rw-r--r--changelog.d/6757.misc1
-rw-r--r--synapse/rest/media/v1/media_storage.py1
-rw-r--r--synapse/rest/media/v1/storage_provider.py6
3 files changed, 8 insertions, 0 deletions
diff --git a/changelog.d/6757.misc b/changelog.d/6757.misc
new file mode 100644

index 0000000000..a50c5e974a --- /dev/null +++ b/changelog.d/6757.misc
@@ -0,0 +1 @@ +Add some debugging for media storage providers. diff --git a/synapse/rest/media/v1/media_storage.py b/synapse/rest/media/v1/media_storage.py
index 3b87717a5a..683a79c966 100644 --- a/synapse/rest/media/v1/media_storage.py +++ b/synapse/rest/media/v1/media_storage.py
@@ -148,6 +148,7 @@ class MediaStorage(object): for provider in self.storage_providers: res = yield provider.fetch(path, file_info) if res: + logger.debug("Streaming %s from %s", path, provider) return res return None diff --git a/synapse/rest/media/v1/storage_provider.py b/synapse/rest/media/v1/storage_provider.py
index 37687ea7f4..858680be26 100644 --- a/synapse/rest/media/v1/storage_provider.py +++ b/synapse/rest/media/v1/storage_provider.py
@@ -77,6 +77,9 @@ class StorageProviderWrapper(StorageProvider): self.store_synchronous = store_synchronous self.store_remote = store_remote + def __str__(self): + return "StorageProviderWrapper[%s]" % (self.backend,) + def store_file(self, path, file_info): if not file_info.server_name and not self.store_local: return defer.succeed(None) @@ -114,6 +117,9 @@ class FileStorageProviderBackend(StorageProvider): self.cache_directory = hs.config.media_store_path self.base_directory = config + def __str__(self): + return "FileStorageProviderBackend[%s]" % (self.base_directory,) + def store_file(self, path, file_info): """See StorageProvider.store_file"""