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

Clean up writing server sent events.

Browse Source
This commit is contained in:
Franz Liedke
2015-04-23 13:13:17 +02:00
parent 480d6490f5
commit 64114815c7
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/submissions_controller.rb
View File

@@ -70,25 +70,13 @@ class SubmissionsController < ApplicationController
def run def run
with_server_sent_events do |server_sent_event| with_server_sent_events do |server_sent_event|
container_info_sent = false
stderr = ''
output = @docker_client.execute_run_command(@submission, params[:filename]) output = @docker_client.execute_run_command(@submission, params[:filename])
if output
server_sent_event.write({stdout: output[:stdout]}, event: 'output') server_sent_event.write({stdout: output[:stdout]}, event: 'output') if output[:stdout]
server_sent_event.write({stderr: output[:stderr]}, event: 'output') server_sent_event.write({stderr: output[:stderr]}, event: 'output') if output[:stderr]
output[:status] = :ok if output[:status] == 0
server_sent_event.write({status: output[:status]}, event: 'status') server_sent_event.write({status: output[:status]}, event: 'status')
end
#server_sent_event.write({stdout: output[:output][2], event: 'status')
# do |stream, chunk|
# unless container_info_sent
# server_sent_event.write({id: @docker_client.container.try(:id), port_bindings: @docker_client.container.try(:port_bindings)}, event: 'info')
# container_info_sent = true
# end
# server_sent_event.write({stream => chunk}, event: 'output')
# stderr += chunk if stream == :stderr
# end
# server_sent_event.write(output, event: 'status')
if stderr.present? if stderr.present?
if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(stderr) if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(stderr)
server_sent_event.write(hint, event: 'hint') server_sent_event.write(hint, event: 'hint')