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

Revert "Use switch_locale instead of I18n.with_locale directly"

Browse Source 
This reverts commit 125c342f35.
This commit is contained in:
Ralf Teusner
2021-08-05 11:55:54 +02:00
parent b4df53ff54
commit 2c08e270e7
2 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/controllers/concerns/submission_scoring.rb
View File

@ -4,46 +4,49 @@ require 'concurrent/future'
module SubmissionScoring module SubmissionScoring
def collect_test_results(submission) def collect_test_results(submission)
current_locale = I18n.locale
# Mnemosyne.trace 'custom.codeocean.collect_test_results', meta: { submission: submission.id } do # Mnemosyne.trace 'custom.codeocean.collect_test_results', meta: { submission: submission.id } do
futures = submission.collect_files.select(&:teacher_defined_assessment?).map do |file| futures = submission.collect_files.select(&:teacher_defined_assessment?).map do |file|
Concurrent::Future.execute do Concurrent::Future.execute do
# Mnemosyne.trace 'custom.codeocean.collect_test_results_block', meta: { file: file.id, submission: submission.id } do I18n.with_locale(current_locale) do
assessor = Assessor.new(execution_environment: submission.execution_environment) # Mnemosyne.trace 'custom.codeocean.collect_test_results_block', meta: { file: file.id, submission: submission.id } do
output = execute_test_file(file, submission) assessor = Assessor.new(execution_environment: submission.execution_environment)
assessment = assessor.assess(output) output = execute_test_file(file, submission)
passed = ((assessment[:passed] == assessment[:count]) and (assessment[:score]).positive?) assessment = assessor.assess(output)
testrun_output = passed ? nil : "status: #{output[:status]}\n stdout: #{output[:stdout]}\n stderr: #{output[:stderr]}" passed = ((assessment[:passed] == assessment[:count]) and (assessment[:score]).positive?)
if testrun_output.present? testrun_output = passed ? nil : "status: #{output[:status]}\n stdout: #{output[:stdout]}\n stderr: #{output[:stderr]}"
submission.exercise.execution_environment.error_templates.each do |template| if testrun_output.present?
pattern = Regexp.new(template.signature).freeze submission.exercise.execution_environment.error_templates.each do |template|
StructuredError.create_from_template(template, testrun_output, submission) if pattern.match(testrun_output) pattern = Regexp.new(template.signature).freeze
StructuredError.create_from_template(template, testrun_output, submission) if pattern.match(testrun_output)
end
end end
end testrun = Testrun.create(
testrun = Testrun.create( submission: submission,
submission: submission, cause: 'assess', # Required to differ run and assess for RfC show
cause: 'assess', # Required to differ run and assess for RfC show file: file, # Test file that was executed
file: file, # Test file that was executed passed: passed,
passed: passed, output: testrun_output,
output: testrun_output, container_execution_time: output[:container_execution_time],
container_execution_time: output[:container_execution_time], waiting_for_container_time: output[:waiting_for_container_time]
waiting_for_container_time: output[:waiting_for_container_time] )
)
filename = file.name_with_extension filename = file.name_with_extension
if file.teacher_defined_linter? if file.teacher_defined_linter?
LinterCheckRun.create_from(testrun, assessment) LinterCheckRun.create_from(testrun, assessment)
switch_locale do switch_locale do
assessment = assessor.translate_linter(assessment, I18n.locale) assessment = assessor.translate_linter(assessment, I18n.locale)
end
# replace file name with hint if linter is not used for grading. Refactor! # replace file name with hint if linter is not used for grading. Refactor!
filename = t('exercises.implement.not_graded') if file.weight.zero? filename = t('exercises.implement.not_graded') if file.weight.zero?
end end
end
output.merge!(assessment) output.merge!(assessment)
output.merge!(filename: filename, message: feedback_message(file, output), weight: file.weight) output.merge!(filename: filename, message: feedback_message(file, output), weight: file.weight)
# end # end
end
end end
end end
futures.map(&:value) futures.map(&:value)

11
app/controllers/submissions_controller.rb
View File

@ -366,13 +366,16 @@ class SubmissionsController < ApplicationController
# the score_submission call will end up calling docker exec, which is blocking. # the score_submission call will end up calling docker exec, which is blocking.
# to ensure responsiveness, we therefore open a thread here. # to ensure responsiveness, we therefore open a thread here.
current_locale = I18n.locale
Thread.new do Thread.new do
tubesock.send_data JSON.dump(score_submission(@submission)) I18n.with_locale(current_locale) do
tubesock.send_data JSON.dump(score_submission(@submission))
# To enable hints when scoring a submission, uncomment the next line: # To enable hints when scoring a submission, uncomment the next line:
# send_hints(tubesock, StructuredError.where(submission: @submission)) # send_hints(tubesock, StructuredError.where(submission: @submission))
tubesock.send_data JSON.dump({'cmd' => 'exit'}) tubesock.send_data JSON.dump({'cmd' => 'exit'})
end
ensure ensure
ActiveRecord::Base.connection_pool.release_connection ActiveRecord::Base.connection_pool.release_connection
end end