From 480d6490f5a836bc8fa8f8dbf89b2740f6c9d77e Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Thu, 23 Apr 2015 13:09:02 +0200 Subject: [PATCH] Clean up Docker client class. --- lib/docker_client.rb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/docker_client.rb b/lib/docker_client.rb index 98918179..8d43fc5f 100644 --- a/lib/docker_client.rb +++ b/lib/docker_client.rb @@ -177,16 +177,9 @@ class DockerClient def send_command(command, container, &block) Timeout.timeout(@execution_environment.permitted_execution_time.to_i) do output = container.exec(['bash', '-c', command]) - #do |stream, chunk| - # block.call(stream, chunk) if block_given? #this may issue - # if stream == :stderr - ## stderr.push(chunk) - # else - # stdout.push(chunk) - # end - #end + Rails.logger.info "output from container.exec" Rails.logger.info output - {status: output[2], stderr: output[1].join, stdout: output[0].join} + {status: output[2] == 0 ? :ok : :failed, stdout: output[0].join, stderr: output[1].join} end rescue Timeout::Error timeout_occured = true @@ -202,7 +195,7 @@ class DockerClient container = self.class.create_container(@execution_environment) DockerContainerPool.add_to_all_containers(container, @execution_environment) end - {status: :timeout, stderr: '', stdout: ''} + {status: :timeout} ensure Rails.logger.info('send_command ensuring for' + container.to_s) RECYCLE_CONTAINERS ? return_container(container) : self.class.destroy_container(container)