tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix up log lines

Browse source
This commit is contained in:
Erik Johnston 2018-01-16 13:53:43 +00:00
parent 9795b9ebb1
commit 307f88dfb6
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/rest/media/v1/media_repository.py
View file

@ -285,7 +285,7 @@ class MediaRepository(object):
# If we have an entry in the DB, try and look for it # If we have an entry in the DB, try and look for it
if media_info: if media_info:
if media_info["quarantined_by"]: if media_info["quarantined_by"]:
logger.info("Media is quarentined") logger.info("Media is quarantined")
raise NotFoundError() raise NotFoundError()
responder = yield self.media_storage.fetch_media(file_info) responder = yield self.media_storage.fetch_media(file_info)

15
synapse/rest/media/v1/thumbnail_resource.py
View file

@ -85,7 +85,9 @@ class ThumbnailResource(Resource):
media_info = yield self.store.get_local_media(media_id) media_info = yield self.store.get_local_media(media_id)
if not media_info or media_info["quarantined_by"]: if not media_info or media_info["quarantined_by"]:
logger.info("Media is quarantined") if media_info:
logger.info("Media is quarantined")
respond_404(request) respond_404(request)
return return
@ -122,7 +124,8 @@ class ThumbnailResource(Resource):
media_info = yield self.store.get_local_media(media_id) media_info = yield self.store.get_local_media(media_id)
if not media_info or media_info["quarantined_by"]: if not media_info or media_info["quarantined_by"]:
logger.info("Media is quarantined") if media_info["quarantined_by"]:
logger.info("Media is quarantined")
respond_404(request) respond_404(request)
return return
@ -152,7 +155,7 @@ class ThumbnailResource(Resource):
yield respond_with_responder(request, responder, t_type, t_length) yield respond_with_responder(request, responder, t_type, t_length)
return return
logger.debug("We don't have a local thumbnail of that size. Generating") logger.debug("We don't have a thumbnail of that size. Generating")
# Okay, so we generate one. # Okay, so we generate one.
file_path = yield self.media_repo.generate_local_exact_thumbnail( file_path = yield self.media_repo.generate_local_exact_thumbnail(
@ -162,7 +165,7 @@ class ThumbnailResource(Resource):
if file_path: if file_path:
yield respond_with_file(request, desired_type, file_path) yield respond_with_file(request, desired_type, file_path)
else: else:
logger.warn("Failed to generate local thumbnail") logger.warn("Failed to generate thumbnail")
respond_404(request) respond_404(request)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -201,7 +204,7 @@ class ThumbnailResource(Resource):
yield respond_with_responder(request, responder, t_type, t_length) yield respond_with_responder(request, responder, t_type, t_length)
return return
logger.debug("We don't have a remote thumbnail of that size. Generating") logger.debug("We don't have a thumbnail of that size. Generating")
# Okay, so we generate one. # Okay, so we generate one.
file_path = yield self.media_repo.generate_remote_exact_thumbnail( file_path = yield self.media_repo.generate_remote_exact_thumbnail(
@ -212,7 +215,7 @@ class ThumbnailResource(Resource):
if file_path: if file_path:
yield respond_with_file(request, desired_type, file_path) yield respond_with_file(request, desired_type, file_path)
else: else:
logger.warn("Failed to generate remote thumbnail") logger.warn("Failed to generate thumbnail")
respond_404(request) respond_404(request)
@defer.inlineCallbacks @defer.inlineCallbacks