From bdbc372c0c12d73f8c3fb4d653b52af0d980b4e0 Mon Sep 17 00:00:00 2001
From: Ralf Teusner <ralf.teusner@hpi.de>
Date: Fri, 24 Mar 2017 18:47:30 +0100
Subject: [PATCH] fixed saving run results. also fixed websocket closing.

---
 app/controllers/submissions_controller.rb | 12 +++++++-----
 lib/docker_client.rb                      |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb
index 5c9978b7..b9a1846e 100644
--- a/app/controllers/submissions_controller.rb
+++ b/app/controllers/submissions_controller.rb
@@ -182,12 +182,13 @@ class SubmissionsController < ApplicationController
     @message_buffer ||= ""
     # Handle special commands first
     if (/^#exit/.match(message))
-      kill_socket(tubesock)
-
+      # Just call exit_container on the docker_client.
+      # Do not call kill_socket for the websocket to the client here.
+      # @docker_client.exit_container closes the socket to the container,
+      # kill_socket is called in the "on close handler" of the websocket to the container
       @docker_client.exit_container(container)
-      if !@message_buffer.blank?
-        Testrun.create(file: @file, submission: @submission, output: @message_buffer)
-      end
+    elsif /^#timeout/.match(message)
+      @message_buffer = 'timeout: ' + @message_buffer # add information that this run timed out to the buffer
     else
       # Filter out information about run_command, test_command, user or working directory
       run_command = @submission.execution_environment.run_command % command_substitutions(params[:filename])
@@ -243,6 +244,7 @@ class SubmissionsController < ApplicationController
 
   def save_run_output
     if !@message_buffer.blank?
+      @message_buffer = @message_buffer[(0..max_message_buffer_size-1)] # trim the string to max_message_buffer_size chars
       Testrun.create(file: @file, submission: @submission, output: @message_buffer)
     end
   end
diff --git a/lib/docker_client.rb b/lib/docker_client.rb
index 28e2a3fb..76451096 100644
--- a/lib/docker_client.rb
+++ b/lib/docker_client.rb
@@ -255,6 +255,12 @@ class DockerClient
             if(@tubesock)
               @tubesock.send_data JSON.dump({'cmd' => 'timeout'})
             end
+            if(@socket)
+              @socket.send('#timeout')
+              #sleep one more second to ensure that the message reaches the submissions_controller.
+              sleep(1)
+              @socket.close
+            end
             kill_container(container)
           end
         #ensure
@@ -274,6 +280,7 @@ class DockerClient
     Rails.logger.debug('exiting container ' + container.to_s)
     # exit the timeout thread if it is still alive
     exit_thread_if_alive
+    @socket.close
     # if we use pooling and recylce the containers, put it back. otherwise, destroy it.
     (DockerContainerPool.config[:active] && RECYCLE_CONTAINERS) ? self.class.return_container(container, @execution_environment) : self.class.destroy_container(container)
   end