From 7597185fa47a9faa613cd2aaa7c4c7371faecc34 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Tue, 17 Mar 2020 11:24:03 -0700 Subject: [PATCH] Fix reference to unused e to satisfy rubocop --- docker/docker-compose.yml | 6 ++++++ lib/vmpooler/pool_manager.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 55e3383..e508cbd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,6 +9,9 @@ services: - type: bind source: ${PWD}/vmpooler.yaml target: /etc/vmpooler/vmpooler.yaml + - type: bind + source: ${PWD}/providers.yaml + target: /etc/vmpooler/providers.yaml ports: - "4567:4567" networks: @@ -17,6 +20,9 @@ services: - VMPOOLER_DEBUG=true # for use of dummy auth - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml - REDIS_SERVER=redislocal + - EXTRA_CONFIG=/etc/vmpooler/providers.yaml + - LOGFILE=/dev/stdout + - LDAP_PORT=636 image: vmpooler-local depends_on: - redislocal diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index f3b7a39..c6aff25 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -822,7 +822,7 @@ module Vmpooler loop_count += 1 end end - rescue Redis::CannotConnectError => e + rescue Redis::CannotConnectError raise rescue StandardError => e $logger.log('s', "[!] [#{pool['name']}] Error while checking the pool: #{e}")