From 1ac30ea529e9e5dbe9b3c2f038456f3e4c978c6d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 30 Sep 2016 01:45:15 -0500 Subject: [PATCH] proxy ips to match tests, prevent fail for no proxies --- config.yml.travis | 4 ++-- workers/delete_cache_order_worker.rb | 2 ++ workers/purge_cache_order_worker.rb | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.yml.travis b/config.yml.travis index 54c389b2..d0d3287a 100644 --- a/config.yml.travis +++ b/config.yml.travis @@ -14,5 +14,5 @@ logs_path: "/tmp/neocitiestestlogs" letsencrypt_key: ./tests/files/letsencrypt.key letsencrypt_endpoint: https://acme-staging.api.letsencrypt.org/ proxy_ips: - - 127.0.0.1 - - 127.0.0.2 + - 10.0.0.1 + - 10.0.0.2 diff --git a/workers/delete_cache_order_worker.rb b/workers/delete_cache_order_worker.rb index 8cad0a00..3c8eb73e 100644 --- a/workers/delete_cache_order_worker.rb +++ b/workers/delete_cache_order_worker.rb @@ -11,6 +11,8 @@ class DeleteCacheOrderWorker #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} proxy_ips = $config['proxy_ips'] + return if proxy_ips.nil? || proxy_ips.empty? + proxy_ips.each do |proxy_ip| DeleteCacheWorker.perform_async proxy_ip, username, path end diff --git a/workers/purge_cache_order_worker.rb b/workers/purge_cache_order_worker.rb index aa506504..90c3ceec 100644 --- a/workers/purge_cache_order_worker.rb +++ b/workers/purge_cache_order_worker.rb @@ -11,6 +11,8 @@ class PurgeCacheOrderWorker proxy_ips = $config['proxy_ips'] #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} + return if proxy_ips.nil? || proxy_ips.empty? + proxy_ips.each do |proxy_ip| PurgeCacheWorker.perform_async proxy_ip, username, path end