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

Just some comments and todos

Browse Source
This commit is contained in:
Tom Staubitz
2015-12-12 00:47:29 +08:00
parent 3bd31937cc
commit c0955d3505
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/docker_client.rb
View File

@ -121,6 +121,7 @@ class DockerClient
private :create_workspace_files private :create_workspace_files
def create_workspace_file(options = {}) def create_workspace_file(options = {})
#TODO: try catch i/o exception and log failed attempts
file = File.new(local_file_path(options), 'w') file = File.new(local_file_path(options), 'w')
file.write(options[:file].content) file.write(options[:file].content)
file.close file.close
@ -140,10 +141,12 @@ class DockerClient
Rails.logger.error('No further actions are done concerning that.') Rails.logger.error('No further actions are done concerning that.')
end end
#currently only used to check if containers have been started correctly, or other internal checks
def execute_arbitrary_command(command, &block) def execute_arbitrary_command(command, &block)
execute_command(command, nil, block) execute_command(command, nil, block)
end end
#only used by server sent events (deprecated?)
def execute_command(command, before_execution_block, output_consuming_block) def execute_command(command, before_execution_block, output_consuming_block)
#tries ||= 0 #tries ||= 0
@container = DockerContainerPool.get_container(@execution_environment) @container = DockerContainerPool.get_container(@execution_environment)
@ -160,12 +163,13 @@ class DockerClient
#(tries += 1) <= RETRY_COUNT ? retry : raise(error) #(tries += 1) <= RETRY_COUNT ? retry : raise(error)
end end
#called when the user clicks the "Run" button
def execute_websocket_command(command, before_execution_block, output_consuming_block) def execute_websocket_command(command, before_execution_block, output_consuming_block)
@container = DockerContainerPool.get_container(@execution_environment) @container = DockerContainerPool.get_container(@execution_environment)
if @container if @container
@container.status = :executing @container.status = :executing
before_execution_block.try(:call) before_execution_block.try(:call)
# todo catch exception if socket could not be created # TODO: catch exception if socket could not be created
@socket ||= create_socket(@container) @socket ||= create_socket(@container)
# Newline required to flush # Newline required to flush
@socket.send command + "\n" @socket.send command + "\n"
@ -318,6 +322,7 @@ class DockerClient
def send_command(command, container, &block) def send_command(command, container, &block)
result = {status: :failed, stdout: '', stderr: ''} result = {status: :failed, stdout: '', stderr: ''}
Timeout.timeout(@execution_environment.permitted_execution_time.to_i) do Timeout.timeout(@execution_environment.permitted_execution_time.to_i) do
#TODO: check phusion doku again if we need -i -t options here
output = container.exec(['bash', '-c', command]) output = container.exec(['bash', '-c', command])
Rails.logger.info "output from container.exec" Rails.logger.info "output from container.exec"
Rails.logger.info output Rails.logger.info output