From c260d4f2ea8361012d5741143921bee0b129e056 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Sat, 14 Mar 2015 14:34:38 +0100 Subject: [PATCH] fixed absent initiation of refill task --- config/initializers/docker.rb | 2 +- lib/docker_container_pool.rb | 2 +- spec/lib/docker_container_pool_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/docker.rb b/config/initializers/docker.rb index 671eaf2f..809707fb 100644 --- a/config/initializers/docker.rb +++ b/config/initializers/docker.rb @@ -1,6 +1,6 @@ DockerClient.initialize_environment unless Rails.env.test? && `which docker`.blank? -if defined?(Rails::Server) && ActiveRecord::Base.connection.tables.present? && DockerContainerPool.config[:active] +if ActiveRecord::Base.connection.tables.present? && DockerContainerPool.config[:active] DockerContainerPool.start_refill_task at_exit { DockerContainerPool.clean_up } end diff --git a/lib/docker_container_pool.rb b/lib/docker_container_pool.rb index 8b8338ab..c1d16c0a 100644 --- a/lib/docker_container_pool.rb +++ b/lib/docker_container_pool.rb @@ -48,7 +48,7 @@ class DockerContainerPool end def self.start_refill_task - @refill_task = Concurrent::TimerTask.new(execution_interval: config[:refill][:interval], run_now: true, 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 end end diff --git a/spec/lib/docker_container_pool_spec.rb b/spec/lib/docker_container_pool_spec.rb index aadc9ff6..8c7c3335 100644 --- a/spec/lib/docker_container_pool_spec.rb +++ b/spec/lib/docker_container_pool_spec.rb @@ -144,7 +144,7 @@ describe DockerContainerPool do after(:each) { described_class.start_refill_task } it 'creates an asynchronous task' do - expect(Concurrent::TimerTask).to receive(:new).with(execution_interval: interval, run_now: true, timeout_interval: timeout).and_call_original + expect(Concurrent::TimerTask).to receive(:new).with(execution_interval: interval, run_now: false, timeout_interval: timeout).and_call_original end it 'executes the task' do