Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

a bit of debugging for media storage providers #6757

Merged
merged 2 commits into from
Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6757.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add some debugging for media storage providers.
1 change: 1 addition & 0 deletions synapse/rest/media/v1/media_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ def fetch_media(self, file_info):
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
Expand Down
6 changes: 6 additions & 0 deletions synapse/rest/media/v1/storage_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ def __init__(self, backend, store_local, store_synchronous, store_remote):
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)
Expand Down Expand Up @@ -114,6 +117,9 @@ def __init__(self, hs, config):
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"""

Expand Down