From 86f6848ef0514c894d28d8ceda357dd7403e863e Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Thu, 7 May 2020 09:06:47 -0700 Subject: [PATCH] Undo redis new_redis rename. Update vmpooler version in dockerfile. --- bin/vmpooler | 2 +- docker/Dockerfile | 2 +- lib/vmpooler.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/vmpooler b/bin/vmpooler index 69565aa..3730c1f 100755 --- a/bin/vmpooler +++ b/bin/vmpooler @@ -26,7 +26,7 @@ end if torun.include? 'api' api = Thread.new do thr = Vmpooler::API.new - redis = Vmpooler.redis_connection(redis_host, redis_port, redis_password) + redis = Vmpooler.new_redis(redis_host, redis_port, redis_password) thr.helpers.configure(config, redis, metrics) thr.helpers.execute! end diff --git a/docker/Dockerfile b/docker/Dockerfile index 196e94d..e879f1f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ FROM jruby:9.2-jdk -ARG vmpooler_version=0.11.1 +ARG vmpooler_version=0.11.3 COPY docker/docker-entrypoint.sh /usr/local/bin/ diff --git a/lib/vmpooler.rb b/lib/vmpooler.rb index ffcfcd8..5c37a7e 100644 --- a/lib/vmpooler.rb +++ b/lib/vmpooler.rb @@ -113,7 +113,7 @@ module Vmpooler # Create an index of pool aliases parsed_config[:pool_names] = Set.new unless parsed_config[:pools] - redis = redis_connection(parsed_config[:redis]['server'], parsed_config[:redis]['port'], parsed_config[:redis]['password']) + redis = new_redis(parsed_config[:redis]['server'], parsed_config[:redis]['port'], parsed_config[:redis]['password']) parsed_config[:pools] = load_pools_from_redis(redis) end @@ -168,12 +168,12 @@ module Vmpooler timeout: timeout ) { connection = Concurrent::Hash.new - redis = redis_connection(host, port, password) + redis = new_redis(host, port, password) connection['connection'] = redis } end - def self.redis_connection(host = 'localhost', port = nil, password = nil) + def self.new_redis(host = 'localhost', port = nil, password = nil) Redis.new(host: host, port: port, password: password) end