forked from MirrorHub/synapse
502 on /thumbnail when can't contact remote server
This commit is contained in:
parent
2eab219a70
commit
eba4ff1bcb
1 changed files with 10 additions and 4 deletions
|
@ -26,6 +26,7 @@ from .thumbnailer import Thumbnailer
|
||||||
|
|
||||||
from synapse.http.matrixfederationclient import MatrixFederationHttpClient
|
from synapse.http.matrixfederationclient import MatrixFederationHttpClient
|
||||||
from synapse.util.stringutils import random_string
|
from synapse.util.stringutils import random_string
|
||||||
|
from synapse.api.errors import SynapseError
|
||||||
|
|
||||||
from twisted.internet import defer, threads
|
from twisted.internet import defer, threads
|
||||||
|
|
||||||
|
@ -134,10 +135,15 @@ class MediaRepository(object):
|
||||||
request_path = "/".join((
|
request_path = "/".join((
|
||||||
"/_matrix/media/v1/download", server_name, media_id,
|
"/_matrix/media/v1/download", server_name, media_id,
|
||||||
))
|
))
|
||||||
length, headers = yield self.client.get_file(
|
try:
|
||||||
server_name, request_path, output_stream=f,
|
length, headers = yield self.client.get_file(
|
||||||
max_size=self.max_upload_size,
|
server_name, request_path, output_stream=f,
|
||||||
)
|
max_size=self.max_upload_size,
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warn("Failed to fetch remoted media %r", e)
|
||||||
|
raise SynapseError(502, "Failed to fetch remoted media")
|
||||||
|
|
||||||
media_type = headers["Content-Type"][0]
|
media_type = headers["Content-Type"][0]
|
||||||
time_now_ms = self.clock.time_msec()
|
time_now_ms = self.clock.time_msec()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue