Skip to content

Fix handling of domserver errors in judgedaemon. #2839

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

Merged
merged 1 commit into from
Nov 23, 2024
Merged

Fix handling of domserver errors in judgedaemon. #2839

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
10 changes: 5 additions & 5 deletions judge/judgedaemon.main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@ function request(string $url, string $verb = 'GET', $data = '', bool $failonerro
": http status code: " . $status .
", request size = " . strlen(print_r($data, true)) .
", response: " . $response;
if ($status == 500) {
break;
}
} else {
$succeeded = true;
break;
Expand Down Expand Up @@ -757,9 +754,12 @@ function fetch_executable_internal(

// Request open submissions to judge. Any errors will be treated as
// non-fatal: we will just keep on retrying in this loop.
$row = [];
$judging = request('judgehosts/fetch-work', 'POST', ['hostname' => $myhost], false);
// If $judging is null, an error occurred; don't try to decode.
if (!is_null($judging)) {
// If $judging is null, an error occurred; we marked the endpoint already as errorred above.
if (is_null($judging)) {
continue;
} else {
$row = dj_json_decode($judging);
}

Expand Down
Loading