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

Disable custom Mnemosyne trace

Browse Source
This commit is contained in:
Sebastian Serth
2020-06-12 13:57:55 +02:00
parent 4857ced54e
commit b40627b637
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,10 @@ require 'concurrent/future'
module SubmissionScoring module SubmissionScoring
def collect_test_results(submission) def collect_test_results(submission)
Mnemosyne.trace 'custom.codeocean.collect_test_results', meta: { submission: submission.id } do # Mnemosyne.trace 'custom.codeocean.collect_test_results', meta: { submission: submission.id } do
submission.collect_files.select(&:teacher_defined_test?).map do |file| submission.collect_files.select(&:teacher_defined_test?).map do |file|
future = Concurrent::Future.execute do future = Concurrent::Future.execute do
Mnemosyne.trace 'custom.codeocean.collect_test_results_block', meta: { file: file.id, submission: submission.id } do # Mnemosyne.trace 'custom.codeocean.collect_test_results_block', meta: { file: file.id, submission: submission.id } do
assessor = Assessor.new(execution_environment: submission.execution_environment) assessor = Assessor.new(execution_environment: submission.execution_environment)
output = execute_test_file(file, submission) output = execute_test_file(file, submission)
assessment = assessor.assess(output) assessment = assessor.assess(output)
@ -30,17 +30,19 @@ module SubmissionScoring
).save ).save
output.merge!(assessment) output.merge!(assessment)
output.merge!(filename: file.name_with_extension, message: feedback_message(file, output[:score]), weight: file.weight) output.merge!(filename: file.name_with_extension, message: feedback_message(file, output[:score]), weight: file.weight)
end # end
end end
future.value future.value
end end
# end
end end
end
private :collect_test_results private :collect_test_results
def execute_test_file(file, submission) def execute_test_file(file, submission)
DockerClient.new(execution_environment: file.context.execution_environment).execute_test_command(submission, file.name_with_extension) DockerClient.new(execution_environment: file.context.execution_environment).execute_test_command(submission, file.name_with_extension)
end end
private :execute_test_file private :execute_test_file
def feedback_message(file, score) def feedback_message(file, score)
@ -65,7 +67,7 @@ module SubmissionScoring
submission.update(score: score) submission.update(score: score)
if submission.normalized_score == 1.0 if submission.normalized_score == 1.0
Thread.new do Thread.new do
RequestForComment.where(exercise_id: submission.exercise_id, user_id: submission.user_id, user_type: submission.user_type).each{ |rfc| RequestForComment.where(exercise_id: submission.exercise_id, user_id: submission.user_id, user_type: submission.user_type).each { |rfc|
rfc.full_score_reached = true rfc.full_score_reached = true
rfc.save rfc.save
} }