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

Disable DCP if other strategy class is chosen

Browse Source
This commit is contained in:
Sebastian Serth
2021-09-19 12:26:29 +02:00
parent 4ad898ad8b
commit fd9e243064
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/docker_client.rb
View File

@ -230,7 +230,7 @@ class DockerClient
Rails.logger.info("destroying container #{container}")
# Checks only if container assignment is not nil and not whether the container itself is still present.
if container && !DockerContainerPool.config[:active]
if container && !DockerContainerPool.active?
container.kill
container.port_bindings.each_value {|port| PortPool.release(port) }
begin
@ -355,7 +355,7 @@ container_execution_time: nil}
exit_thread_if_alive
@socket.close
# if we use pooling and recylce the containers, put it back. otherwise, destroy it.
if DockerContainerPool.config[:active] && RECYCLE_CONTAINERS
if DockerContainerPool.active? && RECYCLE_CONTAINERS
self.class.return_container(container,
@execution_environment)
else
@ -493,7 +493,7 @@ container_execution_time: nil}
end
# if we use pooling and recylce the containers, put it back. otherwise, destroy it.
if DockerContainerPool.config[:active] && RECYCLE_CONTAINERS
if DockerContainerPool.active? && RECYCLE_CONTAINERS
self.class.return_container(container, @execution_environment)
else
self.class.destroy_container(container)