-
Notifications
You must be signed in to change notification settings - Fork 368
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.
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
ProxyService bugfix #1244
Open
CawaAlreadyTaken
wants to merge
3
commits into
cms-dev:main
Choose a base branch
from
CawaAlreadyTaken:ProxyService_Bugfix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
ProxyService bugfix #1244
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -562,28 +562,31 @@ | |
""" | ||
with SessionGen() as session: | ||
task = Task.get_from_id(task_id, session) | ||
dataset = task.active_dataset | ||
|
||
# This ProxyService may focus on a different contest, and it should | ||
# ignore this update. | ||
if task.contest_id != self.contest_id: | ||
logger.debug("Ignoring dataset change for task %d of contest " | ||
"%d (this ProxyService considers contest %d " | ||
"only).", task_id, task.contest.id, | ||
self.contest_id) | ||
return | ||
|
||
logger.info("Dataset update for task %d (dataset now is %d).", | ||
task.id, dataset.id) | ||
|
||
# max_score and/or extra_headers might have changed. | ||
self.reinitialize() | ||
|
||
for submission in task.submissions: | ||
# Update RWS. | ||
if not submission.participation.hidden and \ | ||
submission.official and \ | ||
submission.get_result() is not None and \ | ||
submission.get_result().scored(): | ||
for operation in self.operations_for_score(submission): | ||
self.enqueue(operation) | ||
if task is not None: | ||
dataset = task.active_dataset | ||
|
||
# This ProxyService may focus on a different contest, and it should | ||
# ignore this update. | ||
if task.contest_id != self.contest_id: | ||
logger.debug("Ignoring dataset change for task %d of contest " | ||
"%d (this ProxyService considers contest %d " | ||
"only).", task_id, task.contest_id, | ||
self.contest_id) | ||
return | ||
|
||
logger.info("Dataset update for task %d (dataset now is %d).", | ||
task.id, dataset.id) | ||
|
||
# max_score and/or extra_headers might have changed. | ||
self.reinitialize() | ||
|
||
for submission in task.submissions: | ||
# Update RWS. | ||
if not submission.participation.hidden and \ | ||
submission.official and \ | ||
submission.get_result() is not None and \ | ||
submission.get_result().scored(): | ||
for operation in self.operations_for_score(submission): | ||
self.enqueue(operation) | ||
else: | ||
logger.warning("Dataset update for unexistent task %d.", task_id) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just corrected each occurrence of it in the file |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be more readable to invert the check here (
if task is None
), returning early in that case. It would avoid having to indent the rest of the code.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right it would make it more readable. I think I fixed it and pushed, I am not sure it's the first time I open a pull request, sorry for any github-wise misbehaviour :D