From 64114815c7ff8f1db2c8a95e4614352497656732 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 23 Apr 2015 13:13:17 +0200 Subject: [PATCH] Clean up writing server sent events. --- app/controllers/submissions_controller.rb | 24 ++++++----------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index fb14ff07..cfd5391e 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -70,25 +70,13 @@ class SubmissionsController < ApplicationController def run with_server_sent_events do |server_sent_event| - container_info_sent = false - stderr = '' output = @docker_client.execute_run_command(@submission, params[:filename]) - if output - server_sent_event.write({stdout: output[:stdout]}, event: 'output') - server_sent_event.write({stderr: output[:stderr]}, event: 'output') - output[:status] = :ok if output[:status] == 0 - 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') + + server_sent_event.write({stdout: output[:stdout]}, event: 'output') if output[:stdout] + server_sent_event.write({stderr: output[:stderr]}, event: 'output') if output[:stderr] + + server_sent_event.write({status: output[:status]}, event: 'status') + if stderr.present? if hint = Whistleblower.new(execution_environment: @submission.execution_environment).generate_hint(stderr) server_sent_event.write(hint, event: 'hint')