puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 10:08:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo redis new_redis rename. Update vmpooler version in dockerfile.

Browse source
This commit is contained in:
kirby@puppetlabs.com 2020-05-07 09:06:47 -07:00
parent ef40f2610b
commit 86f6848ef0
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/vmpooler
View file

@ -26,7 +26,7 @@ end
if torun.include? 'api' if torun.include? 'api'
api = Thread.new do api = Thread.new do
thr = Vmpooler::API.new 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.configure(config, redis, metrics)
thr.helpers.execute! thr.helpers.execute!
end end

2
docker/Dockerfile
View file

@ -10,7 +10,7 @@
FROM jruby:9.2-jdk 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/ COPY docker/docker-entrypoint.sh /usr/local/bin/

6
lib/vmpooler.rb
View file

@ -113,7 +113,7 @@ module Vmpooler
# Create an index of pool aliases # Create an index of pool aliases
parsed_config[:pool_names] = Set.new parsed_config[:pool_names] = Set.new
unless parsed_config[:pools] 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) parsed_config[:pools] = load_pools_from_redis(redis)
end end
@ -168,12 +168,12 @@ module Vmpooler
timeout: timeout timeout: timeout
) { ) {
connection = Concurrent::Hash.new connection = Concurrent::Hash.new
redis = redis_connection(host, port, password) redis = new_redis(host, port, password)
connection['connection'] = redis connection['connection'] = redis
} }
end 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) Redis.new(host: host, port: port, password: password)
end end