Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

events: properly publish abort events #2300

Merged
merged 1 commit into from
Dec 25, 2023
Merged

events: properly publish abort events #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions judge/bridge/judge_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ def on_submission_terminated(self, packet):
self._free_self(packet)

if Submission.objects.filter(id=packet['submission-id']).update(status='AB', result='AB', points=0):
event.post('sub_%s' % Submission.get_id_secret(packet['submission-id']), {'type': 'aborted-submission'})
self._post_update_submission(packet['submission-id'], 'terminated', done=True)
event.post('sub_%s' % Submission.get_id_secret(packet['submission-id']), {'type': 'aborted'})
self._post_update_submission(packet['submission-id'], 'aborted', done=True)
json_log.info(self._make_json_log(packet, action='aborted', finish=True, result='AB'))
else:
logger.warning('Unknown submission: %s', packet['submission-id'])
Expand Down
2 changes: 1 addition & 1 deletion judge/judgeapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,5 @@ def abort_submission(submission):
# and returns a bad-request, the submission is not falsely shown as "Aborted" when it will still be judged.
if not response.get('judge-aborted', True):
Submission.objects.filter(id=submission.id).update(status='AB', result='AB', points=0)
event.post('sub_%s' % Submission.get_id_secret(submission.id), {'type': 'aborted-submission'})
event.post('sub_%s' % Submission.get_id_secret(submission.id), {'type': 'aborted'})
_post_update_submission(submission, done=True)
1 change: 1 addition & 0 deletions templates/submission/status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"{{ EVENT_DAEMON_LOCATION }}", "{{ EVENT_DAEMON_POLL_LOCATION }}",
['sub_{{ submission.id_secret }}'], {{ last_msg }}, function (message) {
switch (message.type) {
case 'aborted':
case 'internal-error':
case 'grading-end':
case 'compile-error':
Expand Down
Loading