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

some more logging (and cleanup)

Browse Source
This commit is contained in:
Ralf Teusner
2015-10-29 16:27:12 +01:00
parent b89bd9d521
commit ef60494911
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/docker_container_pool.rb
View File

@ -30,14 +30,15 @@ class DockerContainerPool
if(!@containers[execution_environment.id].include?(container))
@containers[execution_environment.id]+=[container]
else
Rails.logger.info('failed trying to add existing container ' + container.to_s)
Rails.logger.info('failed trying to add existing container ' + container.to_s + ' to execution_environment ' + execution_environment.to_s)
end
end
def self.create_container(execution_environment)
container = DockerClient.create_container(execution_environment)
container.status = 'available'
container
container = DockerClient.create_container(execution_environment)
container.status = 'available'
Rails.logger.debug('created container ' + container.to_s + ' for execution environment ' + execution_environment.to_s)
container
end
def self.return_container(container, execution_environment)
@ -45,7 +46,7 @@ class DockerContainerPool
if(@containers[execution_environment.id] && !@containers[execution_environment.id].include?(container))
@containers[execution_environment.id].push(container)
else
Rails.logger.info('trying to return existing container ' + container.to_s)
Rails.logger.info('trying to return existing container ' + container.to_s + ' to execution_environment ' + execution_environment.to_s)
end
end
@ -53,11 +54,11 @@ class DockerContainerPool
# if pooling is active, do pooling, otherwise just create an container and return it
if config[:active]
container = @containers[execution_environment.id].try(:shift) || nil
Rails.logger.info('get_container fetched container ' + container.to_s)
Rails.logger.debug('get_container fetched container ' + container.to_s + ' for execution environment ' + execution_environment.to_s)
# just access and the following if we got a container. Otherwise, the execution_environment might be just created and not fully exist yet.
if(container)
Rails.logger.info('get_container remaining avail. containers: ' + @containers[execution_environment.id].size.to_s)
Rails.logger.info('get_container all container count: ' + @all_containers[execution_environment.id].size.to_s)
Rails.logger.debug('get_container remaining avail. containers: ' + @containers[execution_environment.id].size.to_s)
Rails.logger.debug('get_container all container count: ' + @all_containers[execution_environment.id].size.to_s)
end
container
else