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

some changes on logging output (better readability)

Browse Source
This commit is contained in:
Ralf Teusner
2015-08-21 14:43:57 +02:00
parent 3f4eea9738
commit 646e45700b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/docker_container_pool.rb
View File

@ -50,11 +50,12 @@ class DockerContainerPool
end end
def self.get_container(execution_environment) def self.get_container(execution_environment)
# if pooling is active, do pooling, otherwise just create an container and return it
if config[:active] if config[:active]
container = @containers[execution_environment.id].try(:shift) || nil container = @containers[execution_environment.id].try(:shift) || nil
Rails.logger.info('get_container fetched container ' + container.to_s) Rails.logger.info('get_container fetched container ' + container.to_s)
Rails.logger.info('get_container remaining avail. container ' + @containers[execution_environment.id].size.to_s) 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.info('get_container all container count: ' + @all_containers[execution_environment.id].size.to_s)
container container
else else
create_container(execution_environment) create_container(execution_environment)
@ -77,13 +78,16 @@ class DockerContainerPool
def self.refill_for_execution_environment(execution_environment) def self.refill_for_execution_environment(execution_environment)
refill_count = [execution_environment.pool_size - @all_containers[execution_environment.id].length, config[:refill][:batch_size]].min refill_count = [execution_environment.pool_size - @all_containers[execution_environment.id].length, config[:refill][:batch_size]].min
Rails.logger.info('adding' + refill_count.to_s + ' containers for ' + execution_environment.name ) if refill_count > 0
Rails.logger.info('adding ' + refill_count.to_s + ' containers for ' + execution_environment.name )
c = refill_count.times.map { create_container(execution_environment) } c = refill_count.times.map { create_container(execution_environment) }
@containers[execution_environment.id] += c @containers[execution_environment.id] += c
@all_containers[execution_environment.id] += c @all_containers[execution_environment.id] += c
#refill_count.times.map { create_container(execution_environment) } #refill_count.times.map { create_container(execution_environment) }
end end
end
def self.start_refill_task def self.start_refill_task
@refill_task = Concurrent::TimerTask.new(execution_interval: config[:refill][:interval], run_now: false, timeout_interval: config[:refill][:timeout]) { refill } @refill_task = Concurrent::TimerTask.new(execution_interval: config[:refill][:interval], run_now: false, timeout_interval: config[:refill][:timeout]) { refill }
@refill_task.execute @refill_task.execute