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

Fixed container-ending on exit.

Browse Source
This commit is contained in:
Alexander Kastius
2016-09-09 17:06:30 +02:00
parent 3fd43fdee2
commit 6ff3d36809
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/docker_client.rb
View File

@ -261,16 +261,21 @@ class DockerClient
end
end
def exit_container(container)
Rails.logger.debug('exiting container ' + container.to_s)
# exit the timeout thread if it is still alive
def exit_thread_if_alive
if(@thread && @thread.alive?)
@thread.exit
end
end
def exit_container(container)
Rails.logger.debug('exiting container ' + container.to_s)
# exit the timeout thread if it is still alive
exit_thread_if_alive
# 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
def kill_container(container)
Rails.logger.info('killing container ' + container.to_s)
# remove container from pool, then destroy it
@ -286,6 +291,7 @@ class DockerClient
container = self.class.create_container(@execution_environment)
DockerContainerPool.add_to_all_containers(container, @execution_environment)
end
exit_thread_if_alive
end
def execute_run_command(submission, filename, &block)