Skip to content

Commit d5e5ebe

Browse files
committed
Correctly catch repo getlogs() errors
1 parent 92ef86d commit d5e5ebe

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

codespeed/views.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,14 @@ def reports(request):
719719
def displaylogs(request):
720720
rev = get_object_or_404(Revision, pk=request.GET.get('revisionid'))
721721
logs = []
722-
logs.append(rev)
722+
logs.append(
723+
{
724+
'date': str(rev.date), 'author': rev.author,
725+
'author_email': '', 'message': rev.message,
726+
'short_commit_id': rev.get_short_commitid(),
727+
'commitid': rev.commitid
728+
}
729+
)
723730
error = False
724731
try:
725732
startrev = Revision.objects.filter(
@@ -740,8 +747,10 @@ def displaylogs(request):
740747
logs = remotelogs
741748
else:
742749
error = 'no logs found'
743-
except StandardError, e:
744-
logger.error("Unhandled exception displaying logs for %s: %s", rev, e, exc_info=True)
750+
except (StandardError, RuntimeError) as e:
751+
logger.error(
752+
"Unhandled exception displaying logs for %s: %s",
753+
rev, e, exc_info=True)
745754
error = repr(e)
746755

747756
# add commit browsing url to logs

0 commit comments

Comments
 (0)