htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the testrun[:status] is available in more cases

Browse Source
This commit is contained in:
Sebastian Serth
2022-07-15 00:36:37 +02:00
parent 56eab88f88
commit 1183f5cdcd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/submissions_controller.rb
View File

@ -93,7 +93,7 @@ class SubmissionsController < ApplicationController
client_socket.onclose do |_event| client_socket.onclose do |_event|
runner_socket&.close(:terminated_by_client) runner_socket&.close(:terminated_by_client)
# We do not update the @testrun[:status] by design, it would be missleading @testrun[:status] ||= :terminated_by_client
end end
client_socket.onmessage do |raw_event| client_socket.onmessage do |raw_event|
@ -187,11 +187,13 @@ class SubmissionsController < ApplicationController
send_and_store client_socket, {cmd: :status, status: :timeout} send_and_store client_socket, {cmd: :status, status: :timeout}
close_client_connection(client_socket) close_client_connection(client_socket)
Rails.logger.debug { "Running a submission timed out: #{e.message}" } Rails.logger.debug { "Running a submission timed out: #{e.message}" }
@testrun[:status] ||= :timeout
@testrun[:output] = "timeout: #{@testrun[:output]}" @testrun[:output] = "timeout: #{@testrun[:output]}"
extract_durations(e) extract_durations(e)
rescue Runner::Error => e rescue Runner::Error => e
send_and_store client_socket, {cmd: :status, status: :container_depleted} send_and_store client_socket, {cmd: :status, status: :container_depleted}
close_client_connection(client_socket) close_client_connection(client_socket)
@testrun[:status] ||= :container_depleted
Rails.logger.debug { "Runner error while running a submission: #{e.message}" } Rails.logger.debug { "Runner error while running a submission: #{e.message}" }
extract_durations(e) extract_durations(e)
ensure ensure