sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Update logging calls

Browse source
This commit is contained in:
Sonny 2020-06-29 20:54:46 +02:00
parent 73ddb785e0
commit fcf49fa123
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/newsreader/news/collection/feed.py
View file

@ -162,6 +162,8 @@ class FeedClient(Client):
yield response_data yield response_data
except StreamException as e: except StreamException as e:
logger.exception("Request failed")
length = stream.rule._meta.get_field("error").max_length length = stream.rule._meta.get_field("error").max_length
stream.rule.error = e.message[-length:] stream.rule.error = e.message[-length:]
stream.rule.succeeded = False stream.rule.succeeded = False
@ -277,7 +279,7 @@ class FeedDuplicateHandler:
remote_identifier=instance.remote_identifier remote_identifier=instance.remote_identifier
) )
except ObjectDoesNotExist: except ObjectDoesNotExist:
logger.error( logger.exception(
f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so." f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so."
) )
return instance return instance
@ -300,7 +302,7 @@ class FeedDuplicateHandler:
try: try:
existing_post = self.queryset.get(**query_values) existing_post = self.queryset.get(**query_values)
except ObjectDoesNotExist: except ObjectDoesNotExist:
logger.error( logger.exception(
f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so." f"Duplicate handler tried retrieving post {instance.remote_identifier} but failed doing so."
) )
return instance return instance

4
src/newsreader/news/collection/tasks.py
View file

@ -34,7 +34,9 @@ class FeedTask(app.Task):
collector = FeedCollector() collector = FeedCollector()
collector.collect(rules=rules) collector.collect(rules=rules)
else: else:
logger.info(f"Cancelling task due to existing lock for user {user_pk}") logger.warning(
f"Cancelling task due to existing lock for user {user_pk}"
)
raise Reject(reason="Task already running", requeue=False) raise Reject(reason="Task already running", requeue=False)