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

save run outputs with cause requestComments with more content (5000 chars instead of 500). Always save full JSON content.

Browse Source
This commit is contained in:
Ralf Teusner
2017-09-20 13:10:37 +02:00
parent ae1e465d1f
commit 44f70ea3da
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/submissions_controller.rb
View File

@ -13,8 +13,12 @@ class SubmissionsController < ApplicationController
before_action :set_mime_type, only: [:download_file, :render_file] before_action :set_mime_type, only: [:download_file, :render_file]
skip_before_action :verify_authenticity_token, only: [:download_file, :render_file] skip_before_action :verify_authenticity_token, only: [:download_file, :render_file]
def max_message_buffer_size def max_run_output_buffer_size
500 if(@submission.cause == 'requestComments')
5000
else
500
end
end end
def authorize! def authorize!
@ -196,7 +200,7 @@ class SubmissionsController < ApplicationController
end end
def handle_message(message, tubesock, container) def handle_message(message, tubesock, container)
@message_buffer ||= "" @run_output ||= ""
# Handle special commands first # Handle special commands first
if (/^#exit/.match(message)) if (/^#exit/.match(message))
# Just call exit_container on the docker_client. # Just call exit_container on the docker_client.
@ -205,19 +209,19 @@ class SubmissionsController < ApplicationController
# kill_socket is called in the "on close handler" of the websocket to the container # kill_socket is called in the "on close handler" of the websocket to the container
@docker_client.exit_container(container) @docker_client.exit_container(container)
elsif /^#timeout/.match(message) elsif /^#timeout/.match(message)
@message_buffer = 'timeout: ' + @message_buffer # add information that this run timed out to the buffer @run_output = 'timeout: ' + @run_output # add information that this run timed out to the buffer
else else
# Filter out information about run_command, test_command, user or working directory # Filter out information about run_command, test_command, user or working directory
run_command = @submission.execution_environment.run_command % command_substitutions(params[:filename]) run_command = @submission.execution_environment.run_command % command_substitutions(params[:filename])
test_command = @submission.execution_environment.test_command % command_substitutions(params[:filename]) test_command = @submission.execution_environment.test_command % command_substitutions(params[:filename])
if !(/root|workspace|#{run_command}|#{test_command}/.match(message)) if !(/root|workspace|#{run_command}|#{test_command}/.match(message))
@message_buffer += message if @message_buffer.size <= max_message_buffer_size
parse_message(message, 'stdout', tubesock) parse_message(message, 'stdout', tubesock)
end end
end end
end end
def parse_message(message, output_stream, socket, recursive = true) def parse_message(message, output_stream, socket, recursive = true)
parsed = '';
begin begin
parsed = JSON.parse(message) parsed = JSON.parse(message)
if(parsed.class == Hash && parsed.key?('cmd')) if(parsed.class == Hash && parsed.key?('cmd'))
@ -256,13 +260,16 @@ class SubmissionsController < ApplicationController
socket.send_data JSON.dump(parsed) socket.send_data JSON.dump(parsed)
Rails.logger.info('parse_message sent: ' + JSON.dump(parsed)) Rails.logger.info('parse_message sent: ' + JSON.dump(parsed))
end end
ensure
# save the data that was send to the run_output if there is enough space left. this will be persisted as a testrun with cause "run"
@run_output += JSON.dump(parsed) if @run_output.size <= max_run_output_buffer_size
end end
end end
def save_run_output def save_run_output
if !@message_buffer.blank? if !@run_output.blank?
@message_buffer = @message_buffer[(0..max_message_buffer_size-1)] # trim the string to max_message_buffer_size chars @run_output = @run_output[(0..max_run_output_buffer_size-1)] # trim the string to max_message_buffer_size chars
Testrun.create(file: @file, cause: 'run', submission: @submission, output: @message_buffer) Testrun.create(file: @file, cause: 'run', submission: @submission, output: @run_output)
end end
end end