diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-01-23 12:11:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 12:11:44 +0000 |
| commit | 6b7462a13fff8f4e1dbad0bb4d81bbe0515af7c1 (patch) | |
| tree | 31ff9771c7b53e239105f38b2e4444573f5ee97e | |
| parent | Minor fixes to user admin api (#6761) (diff) | |
| download | synapse-6b7462a13fff8f4e1dbad0bb4d81bbe0515af7c1.tar.xz | |
a bit of debugging for media storage providers (#6757)
* a bit of debugging for media storage providers * changelog
| -rw-r--r-- | changelog.d/6757.misc | 1 | ||||
| -rw-r--r-- | synapse/rest/media/v1/media_storage.py | 1 | ||||
| -rw-r--r-- | synapse/rest/media/v1/storage_provider.py | 6 |
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""" |