diff --git a/workers/delete_cache_order_worker.rb b/workers/delete_cache_order_worker.rb index cc9bacf5..8cad0a00 100644 --- a/workers/delete_cache_order_worker.rb +++ b/workers/delete_cache_order_worker.rb @@ -8,12 +8,8 @@ class DeleteCacheOrderWorker end def perform(username, path) - if ENV['RACK_ENV'] == 'test' - proxy_ips = ['10.0.0.1', '10.0.0.2'] - else - #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']) - proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} - end + #proxy_ips = Resolv.getaddresses($config['cache_purge_ips_uri']).keep_if {|r| !r.match(/:/)} + proxy_ips = $config['proxy_ips'] proxy_ips.each do |proxy_ip| DeleteCacheWorker.perform_async proxy_ip, username, path diff --git a/workers/delete_cache_worker.rb b/workers/delete_cache_worker.rb index 3b0dc35e..e1514e5d 100644 --- a/workers/delete_cache_worker.rb +++ b/workers/delete_cache_worker.rb @@ -8,7 +8,7 @@ require 'open-uri' class DeleteCacheWorker HTTP_TIMEOUT = 5 include Sidekiq::Worker - sidekiq_options queue: :deletecache, retry: 1000, backtrace: false, average_scheduled_poll_interval: 1 + sidekiq_options queue: :deletecache, retry: 3, backtrace: false, average_scheduled_poll_interval: 1 sidekiq_retry_in do |count| return 10 if count < 10 diff --git a/workers/purge_cache_worker.rb b/workers/purge_cache_worker.rb index 1ce5a260..155648fe 100644 --- a/workers/purge_cache_worker.rb +++ b/workers/purge_cache_worker.rb @@ -3,7 +3,7 @@ require 'open-uri' class PurgeCacheWorker HTTP_TIMEOUT = 5 include Sidekiq::Worker - sidekiq_options queue: :purgecache, retry: 1000, backtrace: false, average_scheduled_poll_interval: 1 + sidekiq_options queue: :purgecache, retry: 3, backtrace: false, average_scheduled_poll_interval: 1 sidekiq_retry_in do |count| return 10 if count < 10